diff options
| author | Xue Fuqiao | 2013-06-12 20:12:47 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-06-12 20:12:47 +0800 |
| commit | 6186a2767fcae48a43675dabc457ed2b2177b884 (patch) | |
| tree | 8eb823df7cbd64d9bf9201c03cadd89fe1e441ac /nt | |
| parent | 8d0b26f65d9d4cf52a11a273073cd52fb1feaf13 (diff) | |
| parent | 5f9dbd7a1241239b5376435e96fbd9dbfa65e0f5 (diff) | |
| download | emacs-6186a2767fcae48a43675dabc457ed2b2177b884.tar.gz emacs-6186a2767fcae48a43675dabc457ed2b2177b884.zip | |
Merge from mainline.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index d9aad787fce..baa7003f5ae 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog | |||
| @@ -108,7 +108,7 @@ | |||
| 108 | 108 | ||
| 109 | 2013-05-07 Paul Eggert <eggert@cs.ucla.edu> | 109 | 2013-05-07 Paul Eggert <eggert@cs.ucla.edu> |
| 110 | 110 | ||
| 111 | Use Gnulib ACL implementation, for benefit of Solaris etc. (Bug#14295) | 111 | Use Gnulib ACL implementation, for benefit of Solaris etc. (Bug#14295) |
| 112 | * config.nt (HAVE_ACL_SET_FILE): Rename from HAVE_POSIX_ACL. | 112 | * config.nt (HAVE_ACL_SET_FILE): Rename from HAVE_POSIX_ACL. |
| 113 | * inc/ms-w32.h (EOPNOTSUPP): New macro. | 113 | * inc/ms-w32.h (EOPNOTSUPP): New macro. |
| 114 | 114 | ||
| @@ -636,7 +636,7 @@ | |||
| 636 | 636 | ||
| 637 | 2012-09-01 Daniel Colascione <dancol@dancol.org> | 637 | 2012-09-01 Daniel Colascione <dancol@dancol.org> |
| 638 | 638 | ||
| 639 | * inc/ms-w32.h (TERM_HEADER): Add for refactoring | 639 | * inc/ms-w32.h (TERM_HEADER): Add for refactoring. |
| 640 | 640 | ||
| 641 | 2012-08-22 Juanma Barranquero <lekktu@gmail.com> | 641 | 2012-08-22 Juanma Barranquero <lekktu@gmail.com> |
| 642 | 642 | ||
| @@ -934,8 +934,8 @@ | |||
| 934 | (install-other-dirs-nmake, install-other-dirs-gmake): Depend on `all'. | 934 | (install-other-dirs-nmake, install-other-dirs-gmake): Depend on `all'. |
| 935 | (install-shortcuts): Depend on $(INSTALL_DIR)/bin. Copy addpm.exe | 935 | (install-shortcuts): Depend on $(INSTALL_DIR)/bin. Copy addpm.exe |
| 936 | here. | 936 | here. |
| 937 | (maybe-copy-distfiles-CMD, maybe-copy-distfiles-SH, dist): Depend | 937 | (maybe-copy-distfiles-CMD, maybe-copy-distfiles-SH, dist): |
| 938 | on create-tmp-dist-dir. | 938 | Depend on create-tmp-dist-dir. |
| 939 | 939 | ||
| 940 | * nmake.defs (DIRNAME): New variable. | 940 | * nmake.defs (DIRNAME): New variable. |
| 941 | (IFNOTSAMEDIR): Use $(DIRNAME)_same-dir.tst instead of | 941 | (IFNOTSAMEDIR): Use $(DIRNAME)_same-dir.tst instead of |