diff options
| author | Joakim Verona | 2013-08-13 17:16:25 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-13 17:16:25 +0200 |
| commit | 7cb2f8b52926d37347e5a412abd7a004707258a6 (patch) | |
| tree | 5cbd59c8cc90806a82ba504fae3ea10e9079ea11 /src/ChangeLog | |
| parent | 2da59f810184f36b4061eb422011de057bd0588e (diff) | |
| parent | 53b64418c20b6288e0e3a589b61db47861a575b6 (diff) | |
| download | emacs-7cb2f8b52926d37347e5a412abd7a004707258a6.tar.gz emacs-7cb2f8b52926d37347e5a412abd7a004707258a6.zip | |
merge from trunk
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 dabc6241967..0c8de046034 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-08-13 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * decompress.c (Fzlib_decompress_region): Try to clarify 'avail_out'. | ||
| 4 | |||
| 1 | 2013-08-13 Dmitry Antipov <dmantipov@yandex.ru> | 5 | 2013-08-13 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 6 | ||
| 3 | * window.h (struct window): Convert left_margin_cols and | 7 | * window.h (struct window): Convert left_margin_cols and |