Move fix for cygw32 icon issue from emacs-24 branch to trunk as Stefan Monnier requests

2 files changed, 8 insertions, 2 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 35fcefe5b1b..60307469232 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,9 @@
+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-12-09  Eli Zaretskii  <eliz@gnu.org>
 
         * inc/unistd.h (unsetenv): Provide a prototype.
diff --git a/nt/emacs.rc b/nt/emacs.rc
index 72aa47212ac..da4283b6fd1 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