diff options
| author | Joakim Verona | 2013-08-13 19:56:17 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-13 19:56:17 +0200 |
| commit | a218d7fbf59ed0896f02bf50ed1702c26696cd30 (patch) | |
| tree | b2236d22cd75ef70c021faa6d4525b408f14c9ea /lisp/ChangeLog | |
| parent | cf79cb9c1756f794b4f5c77b058d09e713f7b364 (diff) | |
| parent | 8259030d684cc11dcaf548a1aea29d7badf921fe (diff) | |
| download | emacs-a218d7fbf59ed0896f02bf50ed1702c26696cd30.tar.gz emacs-a218d7fbf59ed0896f02bf50ed1702c26696cd30.zip | |
merge from trunk
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 11e5e913398..c6f11fec11a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-08-13 Lars Magne Ingebrigtsen <larsi@gnus.org> | ||
| 2 | |||
| 3 | * image.el (image-content-type-suffixes): New variable. | ||
| 4 | |||
| 1 | 2013-08-13 Fabián Ezequiel Gallina <fgallina@gnu.org> | 5 | 2013-08-13 Fabián Ezequiel Gallina <fgallina@gnu.org> |
| 2 | 6 | ||
| 3 | * progmodes/python.el (python-imenu--build-tree) | 7 | * progmodes/python.el (python-imenu--build-tree) |