diff options
| author | Daniel Colascione <[email protected]> | 2014-04-07 13:54:16 -0700 |
|---|---|---|
| committer | Daniel Colascione <[email protected]> | 2014-04-07 13:54:16 -0700 |
| commit | 7e31acf6b81fdce7258077645bc239767c484841 (patch) | |
| tree | 1f0d7b063a19b54982550797df063e0a9f87eaed /nt | |
| parent | 608a4502b9fa8f5681368657fba5d5fd0fa46817 (diff) | |
| parent | e3b838807bf9fbbbec9826de6c1e4efdf72acb78 (diff) | |
Merge from emacs-24; up to 2014-04-01T20:18:[email protected]
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 62a33906b0..8e2875805d 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2014-04-03 Ken Brown <[email protected]> + + * emacs.rc: Don't use manifest on Cygwin. (Bug#17176) + 2014-02-17 Juanma Barranquero <[email protected]> * Makefile.in (install): Create destination directory before copying diff --git a/nt/emacs.rc b/nt/emacs.rc index 2d007ba904..f363e6aad7 100644 --- a/nt/emacs.rc +++ b/nt/emacs.rc @@ -1,10 +1,12 @@ Emacs ICON icons/emacs.ico 32649 CURSOR icons/hand.cur -#if defined (WIN64) || defined (__x86_64__) +#ifndef __CYGWIN__ +#ifdef WIN64 1 24 "emacs-x64.manifest" #else 1 24 "emacs-x86.manifest" #endif +#endif #ifndef VS_VERSION_INFO #define VS_VERSION_INFO 1 |