diff options
| author | Daniel Colascione | 2014-04-07 13:54:16 -0700 |
|---|---|---|
| committer | Daniel Colascione | 2014-04-07 13:54:16 -0700 |
| commit | 7e31acf6b81fdce7258077645bc239767c484841 (patch) | |
| tree | 1f0d7b063a19b54982550797df063e0a9f87eaed /nt | |
| parent | 608a4502b9fa8f5681368657fba5d5fd0fa46817 (diff) | |
| parent | e3b838807bf9fbbbec9826de6c1e4efdf72acb78 (diff) | |
| download | emacs-7e31acf6b81fdce7258077645bc239767c484841.tar.gz emacs-7e31acf6b81fdce7258077645bc239767c484841.zip | |
Merge from emacs-24; up to 2014-04-01T20:18:12Z!eggert@cs.ucla.edu
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 4 | ||||
| -rw-r--r-- | nt/emacs.rc | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 62a33906b0d..8e2875805dd 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-04-03 Ken Brown <kbrown@cornell.edu> | ||
| 2 | |||
| 3 | * emacs.rc: Don't use manifest on Cygwin. (Bug#17176) | ||
| 4 | |||
| 1 | 2014-02-17 Juanma Barranquero <lekktu@gmail.com> | 5 | 2014-02-17 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 6 | ||
| 3 | * Makefile.in (install): Create destination directory before copying | 7 | * Makefile.in (install): Create destination directory before copying |
diff --git a/nt/emacs.rc b/nt/emacs.rc index 2d007ba9043..f363e6aad78 100644 --- a/nt/emacs.rc +++ b/nt/emacs.rc | |||
| @@ -1,10 +1,12 @@ | |||
| 1 | Emacs ICON icons/emacs.ico | 1 | Emacs ICON icons/emacs.ico |
| 2 | 32649 CURSOR icons/hand.cur | 2 | 32649 CURSOR icons/hand.cur |
| 3 | #if defined (WIN64) || defined (__x86_64__) | 3 | #ifndef __CYGWIN__ |
| 4 | #ifdef WIN64 | ||
| 4 | 1 24 "emacs-x64.manifest" | 5 | 1 24 "emacs-x64.manifest" |
| 5 | #else | 6 | #else |
| 6 | 1 24 "emacs-x86.manifest" | 7 | 1 24 "emacs-x86.manifest" |
| 7 | #endif | 8 | #endif |
| 9 | #endif | ||
| 8 | 10 | ||
| 9 | #ifndef VS_VERSION_INFO | 11 | #ifndef VS_VERSION_INFO |
| 10 | #define VS_VERSION_INFO 1 | 12 | #define VS_VERSION_INFO 1 |