diff options
| author | Joakim Verona | 2013-03-04 00:04:13 +0100 |
|---|---|---|
| committer | Joakim Verona | 2013-03-04 00:04:13 +0100 |
| commit | f5bf5325b501b788df2afc4bd2ef3022d2c08b6d (patch) | |
| tree | 79ee2a5d963e88fa621ef336a81f4a852ae263af /admin/ChangeLog | |
| parent | 85c8b5aba5b1a2b3e2a54c58838f091094610279 (diff) | |
| parent | eeb84739372b6235e54f0473a7d924cb07e5faae (diff) | |
| download | emacs-f5bf5325b501b788df2afc4bd2ef3022d2c08b6d.tar.gz emacs-f5bf5325b501b788df2afc4bd2ef3022d2c08b6d.zip | |
auto upstream
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 28e25ad98a3..9389a6af28f 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-03-03 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * bzrmerge.el (bzrmerge-apply): Omit Latin-1 char from diagnostic. | ||
| 4 | If there were a real need, it should be UTF-8 anyway. | ||
| 5 | |||
| 1 | 2013-02-25 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2013-02-25 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | Simplify data_start configuration (Bug#13783). | 8 | Simplify data_start configuration (Bug#13783). |