Fix icon for the cygw32 build on 64-bit Cygwin. (Bug#12993)

[bpt/emacs.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 2ddcd03..a2ebd3e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2013-04-09  Ken Brown  <kbrown@cornell.edu>
+
+       * configure.ac (W32_RES_LINK): Remove unneeded linker directive
+       `-Wl,-bpe-i386', which is confusing in the 64-bit case.
+       (Bug#12993)
+
+2013-04-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Fix --enable-profiling bug introduced by 2013-02-25 change (Bug#13783).
+       * configure.ac (LD_SWITCH_SYSTEM_TEMACS): Append -pg if profiling
+       and if not on GNU/Linux or FreeBSD.
+       * lib/Makefile.am (AM_CFLAGS): Add $(PROFILING_CFLAGS), so that
+       lib/*.o is profiled too.
+
 2013-03-30  Paul Eggert  <eggert@cs.ucla.edu>
 
        Merge from gnulib, incorporating:
@@ -50,6 +64,10 @@
        2013-03-11 putenv: avoid compilation warning on mingw
        2013-03-11 unistd: don't prevent Tru64 Unix from using gnulib strtod.
 
+2013-03-11  Glenn Morris  <rgm@gnu.org>
+
+       * Merge in all changes up to version 24.3 release.
+
 2013-03-06  Paul Eggert  <eggert@cs.ucla.edu>
 
        * configure.ac (TERM_HEADER): Remove duplicate definition (Bug#13872).