Mercurial > emacs
changeset 97229:84d4fb2fbce8
*** empty log message ***
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sat, 02 Aug 2008 16:27:44 +0000 |
| parents | 390c190a3d44 |
| children | a279d4c66e68 |
| files | src/ChangeLog |
| diffstat | 1 files changed, 0 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat Aug 02 16:27:01 2008 +0000 +++ b/src/ChangeLog Sat Aug 02 16:27:44 2008 +0000 @@ -2338,7 +2338,6 @@ (local_heap, local_alloc, local_free, malloc_widget_value) (free_widget_value): Define here. ->>>>>>> 1.6832 2008-06-09 Kenichi Handa <handa@m17n.org> * font.h (Qascii_0): Extern it.