diff options
| author | Paul Eggert | 2011-05-22 17:09:23 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-05-22 17:09:23 -0700 |
| commit | af3d522ffbf83826f80ab8f6d811e19e97c37384 (patch) | |
| tree | 4f3d6047a2e0a30c8374f2da5e02858b0129edac /admin/ChangeLog | |
| parent | 37910ab2514f67d12c5b20b63ec6333c02df43c1 (diff) | |
| parent | 7400048f602459209e89da4680ed9cc351ace4ee (diff) | |
| download | emacs-af3d522ffbf83826f80ab8f6d811e19e97c37384.tar.gz emacs-af3d522ffbf83826f80ab8f6d811e19e97c37384.zip | |
Merge from trunk.
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 853c1941a92..7aaeb1d5ee2 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-05-21 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * bzrmerge.el (bzrmerge-resolve): Suppress prompts about file-locals. | ||
| 4 | |||
| 1 | 2011-03-07 Chong Yidong <cyd@stupidchicken.com> | 5 | 2011-03-07 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 6 | ||
| 3 | * Version 23.3 released. | 7 | * Version 23.3 released. |