diff options
| author | Joakim Verona | 2011-07-30 22:39:55 +0200 |
|---|---|---|
| committer | Joakim Verona | 2011-07-30 22:39:55 +0200 |
| commit | 6752d22f823d01391254b4f10e854f6456d26ed2 (patch) | |
| tree | 86901a8f43cd48f437e11be0e0ee61f656f6969a /src/ChangeLog | |
| parent | c8937ab98654b9161bd7d79ff98a76bd0d3a984d (diff) | |
| parent | 4464a33d9ca54af36ae7a3670273f1445a96425b (diff) | |
| download | emacs-6752d22f823d01391254b4f10e854f6456d26ed2.tar.gz emacs-6752d22f823d01391254b4f10e854f6456d26ed2.zip | |
merge upstream
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6039a54c559..623ccc6f4be 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2011-07-30 Andreas Schwab <schwab@linux-m68k.org> | ||
| 2 | |||
| 3 | * regex.c (re_comp): Protoize. | ||
| 4 | (re_exec): Fix return type. | ||
| 5 | (regexec): Fix type of `ret'. (Bug#9203) | ||
| 6 | |||
| 1 | 2011-07-29 Paul Eggert <eggert@cs.ucla.edu> | 7 | 2011-07-29 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 8 | ||
| 3 | * image.c (check_image_size): Use 1024x1024 if unknown frame (Bug#9189). | 9 | * image.c (check_image_size): Use 1024x1024 if unknown frame (Bug#9189). |