Move fix for bug#12993 to trunk

1 files changed, 0 insertions, 21 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index be2d3dd6a6f..9d9c1fdaff5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,24 +1,3 @@
-2012-12-10  Daniel Colascione  <dancol@dancol.org>
-
-        * w32gui.h (hprevinst, lpCmdLine, nCmdShow): Remove unused
-        declarations.
-
-        * w32fns.c (cache_system_info): Initialize the global hinst
-        variable here so various initialization calls DTRT.
-
-        * unexw32.c (hprevinst, lpCmdLine, nCmdShow): Remove unused
-        variables.
-        (hinst): Remove unneeded extern declaration.
-        (_start): Remove initialization of above variables; remove
-        initialization of hinst, as cache_system_info now does that.
-
-        * emacs.c (main): Call cache_system_info early in startup; we
-        previously weren't calling it in Cygwin builds.
-
-        * Makefile.in (ntsource, WINDRES, W32_RES, W#@_RES_LINK): Teach
-        the autoconf build system how to compile a Windows resource file
-        and link it to Emacs.
-
 2012-12-08  Jan Djärv  <jan.h.d@swipnet.se>
 
         * nsterm.m (fd_handler:): FD_ZERO fds (Bug#13103).