diff options
| author | Kenichi Handa | 2012-02-17 16:33:15 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-02-17 16:33:15 +0900 |
| commit | 48dd1e399f41aa349e8651d049cb4a707ffd0bb0 (patch) | |
| tree | 54a1d0b537b697ca2cb0bb420d125eafbbbb534c /src/ChangeLog | |
| parent | c406be4337317c4ff4e60dc74a10921bd1102cac (diff) | |
| parent | bcc657043df41514ec80c3e172c6872b88221005 (diff) | |
| download | emacs-48dd1e399f41aa349e8651d049cb4a707ffd0bb0.tar.gz emacs-48dd1e399f41aa349e8651d049cb4a707ffd0bb0.zip | |
merge trunk
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7893cd68396..12b4fa97c33 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,13 @@ | |||
| 1 | 2012-02-15 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * image.c (MAX_IMAGE_SIZE): Increase from 6.0 to 10.0; see | ||
| 4 | <http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00540.html>. | ||
| 5 | |||
| 6 | 2012-02-15 Chong Yidong <cyd@gnu.org> | ||
| 7 | |||
| 8 | * eval.c (Fdefvar, Fdefconst): Doc fix; note that the variable is | ||
| 9 | marked as special. Also, starting docstrings with * is obsolete. | ||
| 10 | |||
| 1 | 2012-02-13 Andreas Schwab <schwab@linux-m68k.org> | 11 | 2012-02-13 Andreas Schwab <schwab@linux-m68k.org> |
| 2 | 12 | ||
| 3 | * gnutls.c (emacs_gnutls_write): Fix last change. | 13 | * gnutls.c (emacs_gnutls_write): Fix last change. |