diff options
| author | Joakim Verona | 2013-08-16 17:06:52 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-16 17:06:52 +0200 |
| commit | bd2867f0787a5dc14da39859830c3d3024b1e117 (patch) | |
| tree | 72fc6f1f366b102db84dc83e100fbea0a5f3cda3 /src/ChangeLog | |
| parent | 6642817a6e9746bfc25e6e6b9488c9553530875c (diff) | |
| parent | 274ff63f7f7d19c3eb0c365ed7f8347131b9f62e (diff) | |
| download | emacs-bd2867f0787a5dc14da39859830c3d3024b1e117.tar.gz emacs-bd2867f0787a5dc14da39859830c3d3024b1e117.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 ab21a65a805..d5c97748d1a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-08-16 Lars Magne Ingebrigtsen <larsi@gnus.org> | ||
| 2 | |||
| 3 | * image.c: Implement an ImageMagick per-image cache. | ||
| 4 | |||
| 1 | 2013-08-16 Xue Fuqiao <xfq.free@gmail.com> | 5 | 2013-08-16 Xue Fuqiao <xfq.free@gmail.com> |
| 2 | 6 | ||
| 3 | * editfns.c (insert_before_markers): Mention overlay in the doc string. | 7 | * editfns.c (insert_before_markers): Mention overlay in the doc string. |