Mercurial > emacs
comparison src/ChangeLog @ 97952:2c2adcbee8a6
(x_delete_display): Fix merge error.
| author | Andreas Schwab <schwab@suse.de> |
|---|---|
| date | Tue, 02 Sep 2008 11:45:08 +0000 |
| parents | 9d28724e2c52 |
| children | da48a799510d |
comparison
equal
deleted
inserted
replaced
| 97951:12e22cbad134 | 97952:2c2adcbee8a6 |
|---|---|
| 1 2008-09-02 Andreas Schwab <schwab@suse.de> | 1 2008-09-02 Andreas Schwab <schwab@suse.de> |
| 2 | |
| 3 * xterm.c (x_delete_display): Fix merge error. | |
| 2 | 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> |
| 6 | 8 |
