diff options
| author | Joakim Verona | 2013-09-11 18:12:24 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-09-11 18:12:24 +0200 |
| commit | 41c0d73a318ece49776f1131a99e71253f953689 (patch) | |
| tree | 5b839899dca4bfce8bbbe2e42b62e0341fbd8cb9 /src/ChangeLog | |
| parent | e9d8fea04e2d22ba8c6b238444f04d654492fa76 (diff) | |
| parent | 8d2db8be5bccf0d772e0690e612a1f499be4cb48 (diff) | |
| download | emacs-41c0d73a318ece49776f1131a99e71253f953689.tar.gz emacs-41c0d73a318ece49776f1131a99e71253f953689.zip | |
merge from trunk
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index dda202af89f..e3fd6e96ec2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,11 @@ | |||
| 1 | 2013-09-11 Dmitry Antipov <dmantipov@yandex.ru> | 1 | 2013-09-11 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 2 | ||
| 3 | * nsterm.m (syms_of_nsterm): Use Qns. | ||
| 4 | * w32fns.c (Fx_open_connection): Remove old '#if 0' code. | ||
| 5 | * w32term.c (w32_create_terminal, syms_of_w32term): Use Qw32. | ||
| 6 | * xfns.c (x_display_info_for_name, Fx_open_connection): | ||
| 7 | Remove old '#if 0' code. | ||
| 8 | (syms_of_xfns): Use Qx. | ||
| 3 | * termhooks.h (fullscreen_hook): Remove the leftover. | 9 | * termhooks.h (fullscreen_hook): Remove the leftover. |
| 4 | (struct terminal): Fix typo in comment. | 10 | (struct terminal): Fix typo in comment. |
| 5 | 11 | ||