Merge from trunk

1 files changed, 17 insertions, 1 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 3f1e287db34..2a8ac9b8131 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,19 @@
+2012-10-01  Fabrice Popineau  <fabrice.popineau@gmail.com>
+
+        * make-docfile.c (write_globals): Special-case
+        Fexit_recursive_edit and Fabort_recursive_edit as well, as
+        functions that are _Noreturn, to be consistent with
+        src/keyboard.c.
+
+2012-09-30  Eli Zaretskii  <eliz@gnu.org>
+
+        * ntlib.c (gettimeofday): Copy from src/w32.c.  lib/gettime.c
+        needs this function.
+
+2012-09-26  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in (obj): Add profiler.o.
+
 2012-09-17  Glenn Morris  <rgm@gnu.org>
 
         * ebrowse.c (version):
@@ -1038,7 +1054,7 @@
         (Asm_help, default_C_suffixes, default_C_help, Cplusplus_suffixes)
         (Cplusplus_help, Cjava_suffixes, Cobol_suffixes, Cstar_suffixes)
         (Erlang_suffixes, Erlang_help, Forth_suffixes, Forth_help)
-        (Fortran_suffixes, Fortran_help, HTML_suffixes,  HTML_help)
+        (Fortran_suffixes, Fortran_help, HTML_suffixes, HTML_help)
         (Lisp_suffixes, Lisp_help, Lua_suffixes, Lua_help)
         (Makefile_filenames, Makefile_help, Objc_suffixes, Objc_help)
         (Pascal_suffixes, Pascal_help, Perl_suffixes, Perl_interpreters)