diff options
| author | Joakim Verona | 2013-03-26 15:31:46 +0100 |
|---|---|---|
| committer | Joakim Verona | 2013-03-26 15:31:46 +0100 |
| commit | e11705b616777a8a72363b2037d989987630e863 (patch) | |
| tree | fda56011e9ac37da9e53762d8dc24c7a87cbee82 /admin/ChangeLog | |
| parent | c446797d60edf1058f6cbec28e57255d245dd47b (diff) | |
| parent | cded56c19b30e038537398b5213438c339428ed9 (diff) | |
| download | emacs-e11705b616777a8a72363b2037d989987630e863.tar.gz emacs-e11705b616777a8a72363b2037d989987630e863.zip | |
conflict resolve
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 2d09a749907..fcc339c17cd 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,24 @@ | |||
| 1 | 2013-03-13 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | File synchronization fixes (Bug#13944). | ||
| 4 | * CPP-DEFINES (BSD_SYSTEM, HAVE_FSYNC): Remove. | ||
| 5 | * merge-gnulib (GNULIB_MODULES): Add fsync, fdatasync. | ||
| 6 | |||
| 7 | 2013-03-11 Paul Eggert <eggert@cs.ucla.edu> | ||
| 8 | |||
| 9 | * notes/unicode: Improve notes about Emacs source file encoding. | ||
| 10 | |||
| 11 | 2013-03-11 Glenn Morris <rgm@gnu.org> | ||
| 12 | |||
| 13 | * admin.el (make-manuals): Add emacs-lisp-intro and some more | ||
| 14 | doc/misc manuals. | ||
| 15 | (manual-html-mono, manual-html-node, manual-txt): | ||
| 16 | Pass -I to makeinfo. | ||
| 17 | |||
| 18 | 2013-03-10 Glenn Morris <rgm@gnu.org> | ||
| 19 | |||
| 20 | * admin.el (add-release-logs): Use UTC for release date. | ||
| 21 | |||
| 1 | 2013-03-09 Glenn Morris <rgm@gnu.org> | 22 | 2013-03-09 Glenn Morris <rgm@gnu.org> |
| 2 | 23 | ||
| 3 | * admin.el (add-release-logs): Provide interactive defaults. | 24 | * admin.el (add-release-logs): Provide interactive defaults. |