diff options
| author | Glenn Morris | 2012-08-09 23:57:34 -0700 |
|---|---|---|
| committer | Glenn Morris | 2012-08-09 23:57:34 -0700 |
| commit | 23c726f65afecf33df75e5c62d5d930e0d672f01 (patch) | |
| tree | f3006f2ac2b300be0eaaa3c9f9261262922c54ff /admin/ChangeLog | |
| parent | fbb5e3364871172431e32b4b722d1e1fd6312330 (diff) | |
| download | emacs-23c726f65afecf33df75e5c62d5d930e0d672f01.tar.gz emacs-23c726f65afecf33df75e5c62d5d930e0d672f01.zip | |
* admin/bzrmerge.el (bzrmerge-resolve): Disable local eval:.
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 75079a335c9..abe759dc53c 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-08-10 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * bzrmerge.el (bzrmerge-resolve): Disable local eval:. | ||
| 4 | |||
| 1 | 2012-07-14 Eli Zaretskii <eliz@gnu.org> | 5 | 2012-07-14 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * CPP-DEFINES: Remove FILE_SYSTEM_CASE. | 7 | * CPP-DEFINES: Remove FILE_SYSTEM_CASE. |