diff options
| author | Glenn Morris <[email protected]> | 2014-04-10 23:43:20 -0700 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2014-04-10 23:43:20 -0700 |
| commit | 536aa4668198bf4851356a8e3a57b7f8969014c3 (patch) | |
| tree | 5d5a5854c8c615334262036975ab0c755cc93ac6 /nt | |
| parent | c99ce7d8fa9f4af7ece6439c568987e5e7d82681 (diff) | |
| parent | 9b1ac3be88fab32c29c1bd53a8d5eedd81a49cad (diff) | |
Merge from emacs-24; up to 2014-04-04T23:31:[email protected]
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 4 | ||||
| -rw-r--r-- | nt/emacs.rc | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 215eaae15e..8a8dcb14ab 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2014-04-11 Ken Brown <[email protected]> + + * emacs.rc: Revert last change. + 2014-04-07 Ken Brown <[email protected]> * emacs.rc: Don't use manifest on Cygwin. (Bug#17176) diff --git a/nt/emacs.rc b/nt/emacs.rc index f363e6aad7..2d007ba904 100644 --- a/nt/emacs.rc +++ b/nt/emacs.rc @@ -1,12 +1,10 @@ Emacs ICON icons/emacs.ico 32649 CURSOR icons/hand.cur -#ifndef __CYGWIN__ -#ifdef WIN64 +#if defined (WIN64) || defined (__x86_64__) 1 24 "emacs-x64.manifest" #else 1 24 "emacs-x86.manifest" #endif -#endif #ifndef VS_VERSION_INFO #define VS_VERSION_INFO 1 |