diff options
| author | Paul Eggert | 2011-02-20 11:31:01 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-02-20 11:31:01 -0800 |
| commit | 2763cfc26857991fc4ccde9ff837c06032ac1008 (patch) | |
| tree | abac695a874e6c4912897b203ae960499e1b4b36 /src/ChangeLog | |
| parent | d209feedbdbd88aff5479303fdca7f69d6dded27 (diff) | |
| parent | 32159fc37e0281a54dd35abb17aac7302104fd5e (diff) | |
| download | emacs-2763cfc26857991fc4ccde9ff837c06032ac1008.tar.gz emacs-2763cfc26857991fc4ccde9ff837c06032ac1008.zip | |
Merge from mainline.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 880fb10e85a..8bf59d12465 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,14 @@ | |||
| 1 | 2011-02-20 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * makefile.w32-in ($(BLD)/fns.$(O)): Depend on | ||
| 4 | $(EMACS_ROOT)/lib/md5.h and on stamp_BLD. | ||
| 5 | |||
| 6 | 2011-02-20 Christoph Scholtes <cschol2112@gmail.com> | ||
| 7 | |||
| 8 | * makefile.w32-in: Remove md5.$(O). | ||
| 9 | ($(BLD)/md5.$(O)): Remove prerequisites, moved to | ||
| 10 | lib/makefile.w32-in. | ||
| 11 | |||
| 1 | 2011-02-20 Paul Eggert <eggert@cs.ucla.edu> | 12 | 2011-02-20 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 13 | ||
| 3 | Import filemode module from gnulib. | 14 | Import filemode module from gnulib. |