diff options
| author | Andreas Schwab | 2008-09-02 11:45:08 +0000 |
|---|---|---|
| committer | Andreas Schwab | 2008-09-02 11:45:08 +0000 |
| commit | afed25840ba56167fbce37add83d8042a8c18b49 (patch) | |
| tree | 96457572cc9566e8d5547544c158e5d6fe296c76 /src/ChangeLog | |
| parent | 0c5bf94bbd17d83bfb0af255a55976d008054575 (diff) | |
| download | emacs-afed25840ba56167fbce37add83d8042a8c18b49.tar.gz emacs-afed25840ba56167fbce37add83d8042a8c18b49.zip | |
(x_delete_display): Fix merge error.
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 6181aeb59dc..802a4a3ff90 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2008-09-02 Andreas Schwab <schwab@suse.de> | 1 | 2008-09-02 Andreas Schwab <schwab@suse.de> |
| 2 | 2 | ||
| 3 | * xterm.c (x_delete_display): Fix merge error. | ||
| 4 | |||
| 3 | * fileio.c (Fexpand_file_name): Remove unused variables. | 5 | * fileio.c (Fexpand_file_name): Remove unused variables. |
| 4 | 6 | ||
| 5 | 2008-09-02 Eli Zaretskii <eliz@gnu.org> | 7 | 2008-09-02 Eli Zaretskii <eliz@gnu.org> |