diff options
| author | Paul Eggert | 2012-02-24 22:41:40 -0800 |
|---|---|---|
| committer | Paul Eggert | 2012-02-24 22:41:40 -0800 |
| commit | a89654f8f34114db543cb91363e8fded6d73e986 (patch) | |
| tree | 5ac508597ef2aa460308b4b26c244779e48cdb40 /admin/ChangeLog | |
| parent | 6e6c82a4e687708d5a7a3887f92db45bd74da276 (diff) | |
| parent | 67b0de11479247cb8bd8491e10e0b464046f18be (diff) | |
| download | emacs-a89654f8f34114db543cb91363e8fded6d73e986.tar.gz emacs-a89654f8f34114db543cb91363e8fded6d73e986.zip | |
Merge from trunk.
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 2178df6caf0..c7bfc0ddc6e 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,14 @@ | |||
| 1 | 2012-02-16 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * unidata/unidata-gen.el (unidata-prop-alist): Change the default | ||
| 4 | values of name and old-name to nil. | ||
| 5 | (unidata-get-name): Return nil for the default value. | ||
| 6 | |||
| 7 | 2012-02-11 Glenn Morris <rgm@gnu.org> | ||
| 8 | |||
| 9 | * admin.el (cusver-find-files, cusver-scan, cusver-goto-xref) | ||
| 10 | (cusver-check): New functions. | ||
| 11 | |||
| 1 | 2012-01-19 Glenn Morris <rgm@gnu.org> | 12 | 2012-01-19 Glenn Morris <rgm@gnu.org> |
| 2 | 13 | ||
| 3 | * bzrmerge.el (bzrmerge-missing): Allow a definitive "no" answer to the | 14 | * bzrmerge.el (bzrmerge-missing): Allow a definitive "no" answer to the |