diff options
| author | Paul Eggert | 2012-04-10 14:59:42 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-04-10 14:59:42 -0700 |
| commit | 1530927cb9a3dca7c0f41975f2e9e62ef8be92a2 (patch) | |
| tree | 698ded24fc8f63cbbde51a4a5953ea6220e8acb3 /admin/ChangeLog | |
| parent | 271e61eb60721546bf373531852a88f14b840d12 (diff) | |
| parent | 2a718f6fbc7c06bed37d0c8441014b90f9c06b0e (diff) | |
| download | emacs-1530927cb9a3dca7c0f41975f2e9e62ef8be92a2.tar.gz emacs-1530927cb9a3dca7c0f41975f2e9e62ef8be92a2.zip | |
Merge from trunk.
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index ac2323c77d0..a3a756bde64 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2012-04-10 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk". | ||
| 4 | |||
| 5 | * unidata/Makefile.in: Add FSF copyright. | ||
| 6 | Make it use autoconf features, and work for out-of-tree builds. | ||
| 7 | |||
| 1 | 2012-04-07 Eli Zaretskii <eliz@gnu.org> | 8 | 2012-04-07 Eli Zaretskii <eliz@gnu.org> |
| 2 | 9 | ||
| 3 | * unidata/README: | 10 | * unidata/README: |