diff options
| author | Glenn Morris | 2010-10-31 15:35:44 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-10-31 15:35:44 -0700 |
| commit | 8069698297f1d4c65ca6da70e6949b92b5b678d4 (patch) | |
| tree | afbea08fb2795f2e733f8a886611c9f071c705f1 /src/ChangeLog | |
| parent | 389b76fa1b4e96b7da8896cea16d57403d76a947 (diff) | |
| download | emacs-8069698297f1d4c65ca6da70e6949b92b5b678d4.tar.gz emacs-8069698297f1d4c65ca6da70e6949b92b5b678d4.zip | |
* src/xterm.c (x_connection_closed) [USE_X_TOOLKIT]: Fix merge, maybe.
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 15da02b3e3d..00bd97ae29e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2010-10-31 Glenn Morris <rgm@gnu.org> | 1 | 2010-10-31 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * xterm.c (x_connection_closed) [USE_X_TOOLKIT]: Fix merge, maybe. | ||
| 4 | |||
| 3 | * frame.c (syms_of_frame) <tool-bar-mode>: | 5 | * frame.c (syms_of_frame) <tool-bar-mode>: |
| 4 | Default to nil if !HAVE_WINDOW_SYSTEM. (Bug#7299) | 6 | Default to nil if !HAVE_WINDOW_SYSTEM. (Bug#7299) |
| 5 | 7 | ||