diff options
| author | Eli Zaretskii | 2013-04-14 20:27:45 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2013-04-14 20:27:45 +0300 |
| commit | eb7a410c147507ffdf0e84d163a014acb82b19a2 (patch) | |
| tree | 2274bf05e320123c234afbe38dc97932b943c0ea /nt | |
| parent | 64544985029d58bada3486a3eba7f11ce690c526 (diff) | |
| parent | ddd6b68524ba1f957e2f8ddd76eb23e641429b58 (diff) | |
| download | emacs-eb7a410c147507ffdf0e84d163a014acb82b19a2.tar.gz emacs-eb7a410c147507ffdf0e84d163a014acb82b19a2.zip | |
Merge from trunk, resolve conflicts.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 5 | ||||
| -rw-r--r-- | nt/emacs.rc | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 3d2c0e172ff..acc74488424 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-04-09 Ken Brown <kbrown@cornell.edu> | ||
| 2 | |||
| 3 | * emacs.rc: Use 64-bit manifest for 64-bit Cygwin build. | ||
| 4 | (Bug#12993) | ||
| 5 | |||
| 1 | 2013-04-01 Eli Zaretskii <eliz@gnu.org> | 6 | 2013-04-01 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * README: A better documentation of ddeclient.exe. | 8 | * README: A better documentation of ddeclient.exe. |
diff --git a/nt/emacs.rc b/nt/emacs.rc index d2703c45869..81d283f70af 100644 --- a/nt/emacs.rc +++ b/nt/emacs.rc | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | Emacs ICON icons/emacs.ico | 1 | Emacs ICON icons/emacs.ico |
| 2 | 32649 CURSOR icons/hand.cur | 2 | 32649 CURSOR icons/hand.cur |
| 3 | #ifdef WIN64 | 3 | #if defined (WIN64) || defined (__x86_64__) |
| 4 | 1 24 "emacs-x64.manifest" | 4 | 1 24 "emacs-x64.manifest" |
| 5 | #else | 5 | #else |
| 6 | 1 24 "emacs-x86.manifest" | 6 | 1 24 "emacs-x86.manifest" |