diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/Makefile.in | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7618fb202e0..e2c925f03d3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-04-09 Ken Brown <kbrown@cornell.edu> | ||
| 2 | |||
| 3 | * Makefile.in (EMACS_MANIFEST): Revert last change. | ||
| 4 | |||
| 1 | 2014-04-07 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2014-04-07 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * lisp.h (struct Lisp_Symbol): New bitfield `pinned'. | 7 | * lisp.h (struct Lisp_Symbol): New bitfield `pinned'. |
diff --git a/src/Makefile.in b/src/Makefile.in index 7e71d030279..388923596c9 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -259,7 +259,7 @@ W32_LIBS=@W32_LIBS@ | |||
| 259 | 259 | ||
| 260 | ## emacs.res if HAVE_W32 | 260 | ## emacs.res if HAVE_W32 |
| 261 | EMACSRES = @EMACSRES@ | 261 | EMACSRES = @EMACSRES@ |
| 262 | ## emacs-*.manifest if WINDOWSNT | 262 | ## emacs-*.manifest if HAVE_W32 |
| 263 | EMACS_MANIFEST = @EMACS_MANIFEST@ | 263 | EMACS_MANIFEST = @EMACS_MANIFEST@ |
| 264 | ## If HAVE_W32, compiler arguments for including | 264 | ## If HAVE_W32, compiler arguments for including |
| 265 | ## the resource file in the binary. | 265 | ## the resource file in the binary. |