diff options
| author | Grégoire Jadi | 2013-06-15 11:24:47 +0200 |
|---|---|---|
| committer | Grégoire Jadi | 2013-06-15 11:24:47 +0200 |
| commit | 1a0f9e5e80586e4f2157fdfecae250c5619edf15 (patch) | |
| tree | dbf9c38ab630787db0e41667efc19715f7d571b4 /src/ChangeLog | |
| parent | c75684e7603cfea0ec91c63fca0187a5544245c8 (diff) | |
| parent | 2a342ba649407875a265b8d56c9f7c3d87c4b43c (diff) | |
| download | emacs-1a0f9e5e80586e4f2157fdfecae250c5619edf15.tar.gz emacs-1a0f9e5e80586e4f2157fdfecae250c5619edf15.zip | |
Merge branch 'jave-xwidget' into xwidget
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 38eb460359c..827092e7f8a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,12 @@ | |||
| 1 | 2013-06-13 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * lread.c (syms_of_lread): | ||
| 4 | * fns.c (Fprovide): Adjust to new format of after-load-alist. | ||
| 5 | |||
| 6 | 2013-06-13 Kelly Dean <kellydeanch@yahoo.com> (tiny change) | ||
| 7 | |||
| 8 | * fileio.c (Fdo_auto_save): Trap errors in auto-save-hook. (Bug#14479) | ||
| 9 | |||
| 1 | 2013-06-12 Xue Fuqiao <xfq.free@gmail.com> | 10 | 2013-06-12 Xue Fuqiao <xfq.free@gmail.com> |
| 2 | 11 | ||
| 3 | * fileio.c (expand_file_name): Doc fix. | 12 | * fileio.c (expand_file_name): Doc fix. |