diff options
| author | Glenn Morris | 2012-08-28 15:26:41 -0400 |
|---|---|---|
| committer | Glenn Morris | 2012-08-28 15:26:41 -0400 |
| commit | a3f90bea8edc75b7543a06170e5a7521163bbf4e (patch) | |
| tree | 6456dc3be07a34abc57832eb161b33d180166ac3 /admin/ChangeLog | |
| parent | 01e0f0f5d7fd9143d561826ec54afef2a19d80d8 (diff) | |
| download | emacs-a3f90bea8edc75b7543a06170e5a7521163bbf4e.tar.gz emacs-a3f90bea8edc75b7543a06170e5a7521163bbf4e.zip | |
* admin/bzrmerge.el (bzrmerge-merges): Allow unversioned files in the tree.
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 1bbce2ea87a..145028ec815 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-08-28 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * bzrmerge.el (bzrmerge-merges): Allow unversioned files in the tree. | ||
| 4 | |||
| 1 | 2012-08-28 Andreas Schwab <schwab@linux-m68k.org> | 5 | 2012-08-28 Andreas Schwab <schwab@linux-m68k.org> |
| 2 | 6 | ||
| 3 | * charsets/mule-charsets.el (header): Fix typo. | 7 | * charsets/mule-charsets.el (header): Fix typo. |