aboutsummaryrefslogtreecommitdiffstats
path: root/nt
diff options
context:
space:
mode:
Diffstat (limited to 'nt')
-rw-r--r--nt/ChangeLog4
-rw-r--r--nt/emacs.rc4
2 files changed, 5 insertions, 3 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 8e2875805dd..38e5512043d 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
12014-04-09 Ken Brown <kbrown@cornell.edu>
2
3 * emacs.rc: Revert last change.
4
12014-04-03 Ken Brown <kbrown@cornell.edu> 52014-04-03 Ken Brown <kbrown@cornell.edu>
2 6
3 * emacs.rc: Don't use manifest on Cygwin. (Bug#17176) 7 * emacs.rc: Don't use manifest on Cygwin. (Bug#17176)
diff --git a/nt/emacs.rc b/nt/emacs.rc
index fa019b4d98a..92c303ad4ef 100644
--- a/nt/emacs.rc
+++ b/nt/emacs.rc
@@ -1,12 +1,10 @@
1Emacs ICON icons/emacs.ico 1Emacs ICON icons/emacs.ico
232649 CURSOR icons/hand.cur 232649 CURSOR icons/hand.cur
3#ifndef __CYGWIN__ 3#if defined (WIN64) || defined (__x86_64__)
4#ifdef WIN64
51 24 "emacs-x64.manifest" 41 24 "emacs-x64.manifest"
6#else 5#else
71 24 "emacs-x86.manifest" 61 24 "emacs-x86.manifest"
8#endif 7#endif
9#endif
10 8
11#ifndef VS_VERSION_INFO 9#ifndef VS_VERSION_INFO
12#define VS_VERSION_INFO 1 10#define VS_VERSION_INFO 1