diff options
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index a3a756bde64..01f10f4aea5 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-05-02 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit". | ||
| 4 | |||
| 1 | 2012-04-10 Glenn Morris <rgm@gnu.org> | 5 | 2012-04-10 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk". | 7 | * bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk". |
| @@ -1262,7 +1266,7 @@ | |||
| 1262 | ;; coding: utf-8 | 1266 | ;; coding: utf-8 |
| 1263 | ;; End: | 1267 | ;; End: |
| 1264 | 1268 | ||
| 1265 | Copyright (C) 2001-2012 Free Software Foundation, Inc. | 1269 | Copyright (C) 2001-2012 Free Software Foundation, Inc. |
| 1266 | 1270 | ||
| 1267 | This file is part of GNU Emacs. | 1271 | This file is part of GNU Emacs. |
| 1268 | 1272 | ||