diff options
| author | Joakim Verona | 2013-03-26 16:20:17 +0100 |
|---|---|---|
| committer | Joakim Verona | 2013-03-26 16:20:17 +0100 |
| commit | 6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8 (patch) | |
| tree | 4a58903b4c3d010e90fc37fe10ea4d9895876d01 /admin/ChangeLog | |
| parent | 62dd123f7c11ddbe156bc0e84dcb7ca1da5368bb (diff) | |
| parent | 48c226c2c2592e31a47559bd1689fcc4354d9479 (diff) | |
| download | emacs-6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8.tar.gz emacs-6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8.zip | |
conflict resolve
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index fcc339c17cd..8b71b065056 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,18 @@ | |||
| 1 | 2013-03-18 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * notes/unicode: Mention some more iso-2022-7bit files (Bug#13936). | ||
| 4 | |||
| 5 | Automate the build of ja-dic.el (Bug#13984). | ||
| 6 | * notes/unicode: ja-dic.el is now UTF-8. | ||
| 7 | |||
| 8 | 2013-03-16 Glenn Morris <rgm@gnu.org> | ||
| 9 | |||
| 10 | * admin.el (manual-pdf, manual-dvi): Pass -I to texi2pdf, texi2dvi. | ||
| 11 | |||
| 12 | 2013-03-16 Glenn Morris <rgm@gnu.org> | ||
| 13 | |||
| 14 | * admin.el (manual-html-mono, manual-html-node): Add -DWWW_GNU_ORG. | ||
| 15 | |||
| 1 | 2013-03-13 Paul Eggert <eggert@cs.ucla.edu> | 16 | 2013-03-13 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 17 | ||
| 3 | File synchronization fixes (Bug#13944). | 18 | File synchronization fixes (Bug#13944). |