diff options
| author | Paul Eggert | 2011-05-22 14:16:24 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-05-22 14:16:24 -0700 |
| commit | 3f7390b223e8f55faab66259515eed073ebf0f9b (patch) | |
| tree | 8f630c9300ca22cb3434151795994fef806afc70 /src/ChangeLog | |
| parent | f518ae90a612e83f8b5148211f54e1f6de445b81 (diff) | |
| parent | 6307db393033c905554048d4d965cfbdad6760ba (diff) | |
| download | emacs-3f7390b223e8f55faab66259515eed073ebf0f9b.tar.gz emacs-3f7390b223e8f55faab66259515eed073ebf0f9b.zip | |
Merge from mainline.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 06e3641b95f..b6b0556bb23 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-05-22 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * xselect.c (QSAVE_TARGETS): New static var, to fix build failure. | ||
| 4 | |||
| 1 | 2011-05-22 Chong Yidong <cyd@stupidchicken.com> | 5 | 2011-05-22 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 6 | ||
| 3 | * xselect.c (syms_of_xselect): Include character.h; use DEFSYM. | 7 | * xselect.c (syms_of_xselect): Include character.h; use DEFSYM. |