diff options
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index f9986951388..18bb44491a1 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | 2012-08-10 Glenn Morris <rgm@gnu.org> | 1 | 2012-08-11 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * bzrmerge.el (bzrmerge-resolve): Disable local eval:. | 3 | * bzrmerge.el (bzrmerge-resolve): Disable local eval:. |
| 4 | 4 | ||