diff options
| author | Paul Eggert | 2011-02-21 15:46:32 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-02-21 15:46:32 -0800 |
| commit | 9441f0e4fca691e4d2a2c7842373de8f29414b17 (patch) | |
| tree | 6db82cf30a48bd72485db5c4cc2f19d4a142f727 /src/ChangeLog | |
| parent | ba01e9d785457898d873d6c8ec8bc1965fe4ff28 (diff) | |
| parent | e84efb7078b7251b8c8bf15f71fed653cfa535a5 (diff) | |
| download | emacs-9441f0e4fca691e4d2a2c7842373de8f29414b17.tar.gz emacs-9441f0e4fca691e4d2a2c7842373de8f29414b17.zip | |
Merge from mainline.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d95ebb32dee..9713a4a6ed5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2011-02-21 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * makefile.w32-in ($(BLD)/filemode.$(O)): Move recipe to | ||
| 4 | lib/makefilw.w32-in. | ||
| 5 | ($(BLD)/dired.$(O)): Depend on $(EMACS_ROOT)/lib/filemode.h. | ||
| 6 | (GLOBAL_SOURCES): Remove filemode.c. | ||
| 7 | (OBJ1): Remove $(BLD)/filemode.$(O). | ||
| 8 | |||
| 1 | 2011-02-21 Paul Eggert <eggert@cs.ucla.edu> | 9 | 2011-02-21 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 10 | ||
| 3 | Import filemode module from gnulib. | 11 | Import filemode module from gnulib. |