diff options
| author | jave | 2015-01-05 14:12:26 +0100 |
|---|---|---|
| committer | jave | 2015-01-05 14:12:26 +0100 |
| commit | 5a0d5b71d55c73573c331e1e1a1dde9f206966e1 (patch) | |
| tree | abe791ef1dd1838121b43ab63aea630bd439a842 /admin/ChangeLog | |
| parent | 9681f300de4dddb250770d18dc417ec0027beb94 (diff) | |
| parent | c477f2073018ed4deb3810059c1032c1709164fa (diff) | |
| download | emacs-5a0d5b71d55c73573c331e1e1a1dde9f206966e1.tar.gz emacs-5a0d5b71d55c73573c331e1e1a1dde9f206966e1.zip | |
Merge branch 'master' into xwidget
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 83386061180..8c0c9759e87 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -30,6 +30,10 @@ | |||
| 30 | 30 | ||
| 31 | * update-copyright (emacsver): Change to emacsver.tex.in. | 31 | * update-copyright (emacsver): Change to emacsver.tex.in. |
| 32 | 32 | ||
| 33 | 2014-12-25 Paul Eggert <eggert@cs.ucla.edu> | ||
| 34 | |||
| 35 | * merge-gnulib (GNULIB_MODULES): Add stpcpy. | ||
| 36 | |||
| 33 | 2014-12-24 Glenn Morris <rgm@gnu.org> | 37 | 2014-12-24 Glenn Morris <rgm@gnu.org> |
| 34 | 38 | ||
| 35 | * authors.el (authors-obsolete-files-regexps) | 39 | * authors.el (authors-obsolete-files-regexps) |