diff options
| author | Stefan Monnier | 2010-09-30 01:28:20 +0200 |
|---|---|---|
| committer | Stefan Monnier | 2010-09-30 01:28:20 +0200 |
| commit | a01a7932080e8a6e7bc8472c58cefabcc2c37df3 (patch) | |
| tree | 94b28b19c8f1536e76ffe7d5826811b74a79e3a5 /src/ChangeLog.5 | |
| parent | cc390e46c7ba95b76ea133d98fd386214cd01709 (diff) | |
| parent | 6b0f7311f16646e0de2045b2410e20921901c616 (diff) | |
| download | emacs-a01a7932080e8a6e7bc8472c58cefabcc2c37df3.tar.gz emacs-a01a7932080e8a6e7bc8472c58cefabcc2c37df3.zip | |
Merge from trunk
Diffstat (limited to 'src/ChangeLog.5')
| -rw-r--r-- | src/ChangeLog.5 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.5 b/src/ChangeLog.5 index 9be45e2fc54..cc3fcdd88f2 100644 --- a/src/ChangeLog.5 +++ b/src/ChangeLog.5 | |||
| @@ -4093,7 +4093,7 @@ | |||
| 4093 | 4093 | ||
| 4094 | * xterm.h: Delete X10 code. | 4094 | * xterm.h: Delete X10 code. |
| 4095 | 4095 | ||
| 4096 | * xfns.c (Fx_create_frame): Don't increment refernce_count | 4096 | * xfns.c (Fx_create_frame): Don't increment reference_count |
| 4097 | until the frame is put on the frame list. | 4097 | until the frame is put on the frame list. |
| 4098 | 4098 | ||
| 4099 | * xterm.c (x_initialize): Init x_noop_count, x_focus_frame | 4099 | * xterm.c (x_initialize): Init x_noop_count, x_focus_frame |