diff options
author | Daniel Colascione <dancol@dancol.org> | 2012-12-10 09:55:03 -0800 |
---|---|---|
committer | Daniel Colascione <dancol@dancol.org> | 2012-12-10 09:55:03 -0800 |
commit | 78f9ea875a65686b5e300d73dbf22dd96ca29851 (patch) | |
tree | d30e965b537930a2c7ba999210ae56651562ac26 /nt | |
parent | 322a542e6c13eb89b8abc302278e77684c1d6479 (diff) | |
download | emacs-78f9ea875a65686b5e300d73dbf22dd96ca29851.tar.gz |
Move fix for bug#12993 to trunk
Diffstat (limited to 'nt')
-rw-r--r-- | nt/ChangeLog | 6 | ||||
-rw-r--r-- | nt/emacs.rc | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index a70e6c08453..20789c75ec3 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,9 +1,3 @@ -2012-12-10 Daniel Colascione <dancol@dancol.org> - - * emacs.rc: Use forward slashes in relative paths in order to - avoid complaints from Cygwin. (Forward slashes work perfectly - well in the NT build.) - 2012-11-24 Paul Eggert <eggert@cs.ucla.edu> Revert recent change for Bug#8855; see ../src/ChangeLog. diff --git a/nt/emacs.rc b/nt/emacs.rc index 1653dfd1391..cc93da0ffd2 100644 --- a/nt/emacs.rc +++ b/nt/emacs.rc @@ -1,5 +1,5 @@ -Emacs ICON icons/emacs.ico -32649 CURSOR icons/hand.cur +Emacs ICON icons\emacs.ico +32649 CURSOR icons\hand.cur #ifdef WIN64 1 24 "emacs-x64.manifest" #else |