diff options
| author | Stefan Monnier | 2010-05-11 17:02:32 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2010-05-11 17:02:32 -0400 |
| commit | 587e4b13796f78ed582f36ff8b2ea261c6902b6f (patch) | |
| tree | 4d61c28763cad81fec7f5bdaae820a24f0f3daf0 /src/ChangeLog | |
| parent | 841c4085a8087b8c5bc138d5129f7e07f3e18f5f (diff) | |
| parent | dc9ed7949681bcb29cf151c5183efcc50260fa00 (diff) | |
| download | emacs-587e4b13796f78ed582f36ff8b2ea261c6902b6f.tar.gz emacs-587e4b13796f78ed582f36ff8b2ea261c6902b6f.zip | |
Merge from emacs-23
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8bac6573c23..35b5153649a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-05-11 Karel Klic <kklic@redhat.com> | ||
| 2 | |||
| 3 | * ftfont.c: Fix incorrect parentheses of #if condition for | ||
| 4 | definining M17N_FLT_USE_NEW_FEATURE. | ||
| 5 | |||
| 1 | 2010-05-11 Glenn Morris <rgm@gnu.org> | 6 | 2010-05-11 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset. | 8 | * Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset. |