diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2014-11-28 22:55:31 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-11-28 23:07:16 -0800 |
commit | 0cce3623b169732a51f055a86fc926313b11a5ee (patch) | |
tree | 17154977d6e77f604ede0b82f89b2aeb6925310a /nt | |
parent | 9875d23d86c0668b1e697b67a394560d66c7826d (diff) | |
parent | 6b765b8facbdbb03f28028007885236601652515 (diff) | |
download | emacs-0cce3623b169732a51f055a86fc926313b11a5ee.tar.gz |
Merge branch 'emacs-24'.
Diffstat (limited to 'nt')
-rw-r--r-- | nt/.gitignore | 5 | ||||
-rw-r--r-- | nt/ChangeLog | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/nt/.gitignore b/nt/.gitignore deleted file mode 100644 index 4e2fa24e12e..00000000000 --- a/nt/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -config.log -stamp_BLD - -oo/ -oo-spd/ diff --git a/nt/ChangeLog b/nt/ChangeLog index ae292add9c6..6f905627523 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1862,7 +1862,7 @@ * config.nt (HAVE_FACES): Remove, unused. 2008-06-26 Juanma Barranquero <lekktu@gmail.com> - Eli Zaretskii <eliz@gnu.org> + Eli Zaretskii <eliz@gnu.org> * nmake.defs (FONT_CFLAGS): * gmake.defs (FONT_CFLAGS): Remove. @@ -1878,7 +1878,7 @@ * config.nt: Remove reference to UNEXEC_SRC. 2008-06-23 Juanma Barranquero <lekktu@gmail.com> - Eli Zaretskii <eliz@gnu.org> + Eli Zaretskii <eliz@gnu.org> * gmake.defs (DEBUG_FLAG, DEBUG_LINK) [!NODEBUG]: Don't hardcode -gstabs+, use DEBUG_INFO. |