Mercurial > emacs
comparison src/ChangeLog @ 108563:be6f5247ebb4
merge trunk
author | Kenichi Handa <handa@etlken> |
---|---|
date | Fri, 14 May 2010 16:29:06 +0900 |
parents | 23f4cd23ea89 3088b1e22407 |
children | b2ed92d57b33 |
comparison
equal
deleted
inserted
replaced
108561:23f4cd23ea89 | 108563:be6f5247ebb4 |
---|---|
21 | 21 |
22 * font.c (font_range): Return the range for the font found at | 22 * font.c (font_range): Return the range for the font found at |
23 first. | 23 first. |
24 | 24 |
25 2010-05-14 Glenn Morris <rgm@gnu.org> | 25 2010-05-14 Glenn Morris <rgm@gnu.org> |
26 | |
27 * Makefile.in (ns_appdir, ns_appbindir, ns_appsrc): Always define. | |
26 | 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. |
30 (MSDOS_X_OBJ): New variable. | 32 (MSDOS_X_OBJ): New variable. |