diff options
| author | Gerd Moellmann | 1999-12-06 21:23:20 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 1999-12-06 21:23:20 +0000 |
| commit | 397e4fae84e4f568b7280fbc5c39cd04f1f67653 (patch) | |
| tree | a8207b7bd3e0311eac19190243d67776b262180c /src/ChangeLog | |
| parent | 3d973f71150d7afd6fda5e1d9f07410ead0022de (diff) | |
| download | emacs-397e4fae84e4f568b7280fbc5c39cd04f1f67653.tar.gz emacs-397e4fae84e4f568b7280fbc5c39cd04f1f67653.zip | |
(set_lface_from_font_name): Fix incomplete merge.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6f0eba3af48..091604204d8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 1999-12-06 Gerd Moellmann <gerd@gnu.org> | ||
| 2 | |||
| 3 | * xfaces.c (set_lface_from_font_name): Fix incomplete merge. | ||
| 4 | |||
| 1 | 1999-12-04 Hrvoje Niksic <hniksic@iskon.hr> | 5 | 1999-12-04 Hrvoje Niksic <hniksic@iskon.hr> |
| 2 | 6 | ||
| 3 | * lread.c (Fintern_soft): Accept a symbol argument. | 7 | * lread.c (Fintern_soft): Accept a symbol argument. |