Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

1 files changed, 12 insertions, 0 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 9b6c0daf210..07a72ecaf0d 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,15 @@
+2014-12-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * Makefile.in (etags_libs, ebrowse${EXEEXT}, profile${EXEEXT})
+        (make-docfile${EXEEXT}, movemail${EXEEXT})
+        (update-game-score${EXEEXT}): Put $(NTLIB) before $(LOADLIBES),
+        since GCC sometimes calls stpcpy when it sees strcpy, under
+        optimization switches.
+
+2014-12-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * etags.c (analyze_regex): Rename from analyse_regex.
+
 2014-12-14  Glenn Morris  <rgm@gnu.org>
 
         * grep-changelog: Remove file.