diff options
| author | Glenn Morris | 2012-10-13 17:17:07 -0700 |
|---|---|---|
| committer | Glenn Morris | 2012-10-13 17:17:07 -0700 |
| commit | 8336c6b3c5a971104437ca1939fae3ab998c486a (patch) | |
| tree | 0a14b3ffd3a4a0e6f452b5ea065294df7c402c2f /src | |
| parent | 537f336d6228aa48d36c7749aff348569da0ab61 (diff) | |
| download | emacs-8336c6b3c5a971104437ca1939fae3ab998c486a.tar.gz emacs-8336c6b3c5a971104437ca1939fae3ab998c486a.zip | |
ChangeLog fix
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6bb34d9866a..346fe0e86b3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1294,7 +1294,6 @@ | |||
| 1294 | * sysdep.c (init_signals): Do not use SA_NODEFER. It wasn't | 1294 | * sysdep.c (init_signals): Do not use SA_NODEFER. It wasn't |
| 1295 | wanted even on POSIXish hosts, and it doesn't work on Windows. | 1295 | wanted even on POSIXish hosts, and it doesn't work on Windows. |
| 1296 | 1296 | ||
| 1297 | >>>>>>> MERGE-SOURCE | ||
| 1298 | 2012-09-23 Jan Djärv <jan.h.d@swipnet.se> | 1297 | 2012-09-23 Jan Djärv <jan.h.d@swipnet.se> |
| 1299 | 1298 | ||
| 1300 | * xterm.c (x_term_init): Call fixup_locale before and after calling | 1299 | * xterm.c (x_term_init): Call fixup_locale before and after calling |