diff options
| author | Paul Eggert | 2014-04-22 14:32:51 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-04-22 14:32:51 -0700 |
| commit | 42e910349d699ee3f8024371ca1e60e015fc6aa7 (patch) | |
| tree | ba589f3f7c278671f0ae9c5c8f15c241ae8dd674 /nt/ChangeLog | |
| parent | 4f96579371290b201a973072a1c2f237755bb954 (diff) | |
| parent | 34e856d5ac828753b7be20e2471f39fb613f7f40 (diff) | |
| download | emacs-42e910349d699ee3f8024371ca1e60e015fc6aa7.tar.gz emacs-42e910349d699ee3f8024371ca1e60e015fc6aa7.zip | |
Merge from emacs-24; up to 2014-04-22T20:19:17Z!eggert@cs.ucla.edu
Diffstat (limited to 'nt/ChangeLog')
| -rw-r--r-- | nt/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 8a8dcb14abd..9e7773a7421 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-04-22 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * inc/ms-w32.h (lseek): Define only if not already a macro. | ||
| 4 | Suggested by Fabrice Popineau <fabrice.popineau@gmail.com>. | ||
| 5 | |||
| 1 | 2014-04-11 Ken Brown <kbrown@cornell.edu> | 6 | 2014-04-11 Ken Brown <kbrown@cornell.edu> |
| 2 | 7 | ||
| 3 | * emacs.rc: Revert last change. | 8 | * emacs.rc: Revert last change. |