aboutsummaryrefslogtreecommitdiffstats
path: root/nt
diff options
context:
space:
mode:
authorDaniel Colascione2012-12-09 23:11:21 -0800
committerDaniel Colascione2012-12-09 23:11:21 -0800
commit1cf1bbd51e91f02a1d3fabb4f7ea4b1322c4259c (patch)
tree6a1f7358551d0ce22522ba9dbf816a75a0321bec /nt
parentf433306af510e86a614e9f9f082b6d2d5f56a968 (diff)
downloademacs-1cf1bbd51e91f02a1d3fabb4f7ea4b1322c4259c.tar.gz
emacs-1cf1bbd51e91f02a1d3fabb4f7ea4b1322c4259c.zip
Compile Windows resources into cygw32 Emacs
Diffstat (limited to 'nt')
-rw-r--r--nt/ChangeLog6
-rw-r--r--nt/emacs.rc4
2 files changed, 8 insertions, 2 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 20789c75ec3..a70e6c08453 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,9 @@
12012-12-10 Daniel Colascione <dancol@dancol.org>
2
3 * emacs.rc: Use forward slashes in relative paths in order to
4 avoid complaints from Cygwin. (Forward slashes work perfectly
5 well in the NT build.)
6
12012-11-24 Paul Eggert <eggert@cs.ucla.edu> 72012-11-24 Paul Eggert <eggert@cs.ucla.edu>
2 8
3 Revert recent change for Bug#8855; see ../src/ChangeLog. 9 Revert recent change for Bug#8855; see ../src/ChangeLog.
diff --git a/nt/emacs.rc b/nt/emacs.rc
index cc93da0ffd2..1653dfd1391 100644
--- a/nt/emacs.rc
+++ b/nt/emacs.rc
@@ -1,5 +1,5 @@
1Emacs ICON icons\emacs.ico 1Emacs ICON icons/emacs.ico
232649 CURSOR icons\hand.cur 232649 CURSOR icons/hand.cur
3#ifdef WIN64 3#ifdef WIN64
41 24 "emacs-x64.manifest" 41 24 "emacs-x64.manifest"
5#else 5#else