diff options
| author | Kenichi Handa | 2011-02-02 11:16:53 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2011-02-02 11:16:53 +0900 |
| commit | 15d73a19fc9f52899e803625dc31cbc90c13fba0 (patch) | |
| tree | 575d0fb929a1b242869c6149de9887159cc9d4ec /src/ChangeLog | |
| parent | ea2460a0d88ffbc96a8897d754d6cdd08e117ed6 (diff) | |
| parent | 29feb0e9b580626b79a990cf9dbd1577c354dc46 (diff) | |
| download | emacs-15d73a19fc9f52899e803625dc31cbc90c13fba0.tar.gz emacs-15d73a19fc9f52899e803625dc31cbc90c13fba0.zip | |
merge emacs-23
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 8af6bafd903..8bc84675c92 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -4,6 +4,10 @@ | |||
| 4 | 4 | ||
| 5 | * xftfont.c (xftfont_open): Likewise. | 5 | * xftfont.c (xftfont_open): Likewise. |
| 6 | 6 | ||
| 7 | 2011-02-01 Andreas Schwab <schwab@linux-m68k.org> | ||
| 8 | |||
| 9 | * window.c (Fselect_window): Add missing return value. | ||
| 10 | |||
| 7 | 2011-01-29 Andreas Schwab <schwab@linux-m68k.org> | 11 | 2011-01-29 Andreas Schwab <schwab@linux-m68k.org> |
| 8 | 12 | ||
| 9 | * image.c (DEF_IMGLIB_FN): Add parameter rettype, use it instead | 13 | * image.c (DEF_IMGLIB_FN): Add parameter rettype, use it instead |