diff options
| author | Kenichi Handa <handa@gnu.org> | 2012-09-30 23:39:46 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@gnu.org> | 2012-09-30 23:39:46 +0900 |
| commit | c194970e15b6d6efa07697679a25dfab3aa76442 (patch) | |
| tree | 49aec8be9d2dcc74ad3c81f562e48308d8e27b75 /lib-src | |
| parent | 95402d5faa114a311cabfb8c64cf22a93787a066 (diff) | |
| parent | dd946752ab8810149a66a3eff469eb128709972d (diff) | |
| download | emacs-c194970e15b6d6efa07697679a25dfab3aa76442.tar.gz | |
merge trunk
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 6 | ||||
| -rw-r--r-- | lib-src/makefile.w32-in | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 3f1e287db34..4c25f54545d 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +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 +1042,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) diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index 64974b88b6f..23ef71de10c 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in @@ -140,7 +140,7 @@ obj = dosfns.o msdos.o \ process.o callproc.o unexw32.o \ region-cache.o sound.o atimer.o \ doprnt.o intervals.o textprop.o composite.o \ - gnutls.o xml.o + gnutls.o xml.o profiler.o # # These are the lisp files that are loaded up in loadup.el |