diff options
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 145028ec815..54fea2615fd 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-09-04 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Simplify redefinition of 'abort' (Bug#12316). | ||
| 4 | * CPP-DEFINES (NO_ABORT): Remove. | ||
| 5 | |||
| 1 | 2012-08-28 Glenn Morris <rgm@gnu.org> | 6 | 2012-08-28 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * bzrmerge.el (bzrmerge-merges): Allow unversioned files in the tree. | 8 | * bzrmerge.el (bzrmerge-merges): Allow unversioned files in the tree. |