1 files changed, 24 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c45ec824919..e5308e2db3b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,27 @@
+2013-05-16  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32.c: Include epaths.h.
+        (init_environment): Use cmdproxy.exe without leading directories.
+        Support emacs.exe in src; point SHELL to cmdproxy in ../nt in that
+        case.
+        (gettimeofday): Adjust signature and return value to Posix
+        expectations.
+
+        * unexw32.c (open_output_file): Delete the existing emacs.exe
+        before creating it, to break the hard link to the versioned
+        executable.
+
+        * Makefile.in (EMACS_MANIFEST, CM_OBJ, TEMACS_POST_LINK)
+        (ADDSECTION, EMACS_HEAPSIZE, MINGW_TEMACS_POST_LINK)
+        (FIRSTFILE_OBJ): New variables.
+        (W32_RES): Rename to EMACSRES.  All users changed.
+        (base_obj): Use $(CM_OBJ).
+        (ALLOBJS): Use $(FIRSTFILE_OBJ).
+        (emacs$(EXEEXT)): Depend on $(ADDSECTION).
+        (temacs$(EXEEXT)): Use $(TEMACS_POST_LINK), and move
+        $(W32_RES_LINK) before $(LIBES).
+        (emacs.res): Depend on $(EMACS_MANIFEST).  Put emacs.rc in nt.
+
 2013-05-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * makefile.w32-in (DOC): Use just "DOC".