diff options
| author | Kenichi Handa | 2010-05-14 16:29:06 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2010-05-14 16:29:06 +0900 |
| commit | c2eb4a8321dd86f085724c709e881663c81d0c6b (patch) | |
| tree | 1307a8cecc11966020dd53e230551e932e89a272 /src/ChangeLog | |
| parent | ccd3ce49e08b4f0c0e1bcbb34e9055ca4002e21c (diff) | |
| parent | 177b028808f53afbb49328faeb683c2dd55a1794 (diff) | |
| download | emacs-c2eb4a8321dd86f085724c709e881663c81d0c6b.tar.gz emacs-c2eb4a8321dd86f085724c709e881663c81d0c6b.zip | |
merge trunk
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 51a63c046c7..5d47f437d4a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -24,6 +24,8 @@ | |||
| 24 | 24 | ||
| 25 | 2010-05-14 Glenn Morris <rgm@gnu.org> | 25 | 2010-05-14 Glenn Morris <rgm@gnu.org> |
| 26 | 26 | ||
| 27 | * Makefile.in (ns_appdir, ns_appbindir, ns_appsrc): Always define. | ||
| 28 | |||
| 27 | * Makefile.in (mktime, X11, register): Move undefs to configure. | 29 | * Makefile.in (mktime, X11, register): Move undefs to configure. |
| 28 | 30 | ||
| 29 | * Makefile.in (MSDOS_OBJ): Default to empty, let msdos scripts set it. | 31 | * Makefile.in (MSDOS_OBJ): Default to empty, let msdos scripts set it. |