diff options
| author | Joakim Verona | 2013-08-13 18:51:49 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-13 18:51:49 +0200 |
| commit | cf79cb9c1756f794b4f5c77b058d09e713f7b364 (patch) | |
| tree | 7d75c0c55ce7fbb87d15c32f5a7108a8ffd4b517 /lisp/ChangeLog | |
| parent | c5f293d04763b207b3bb1120230c10f8096dc232 (diff) | |
| parent | ad75644970a5deccb1d40465e20087f5806ed3df (diff) | |
| download | emacs-cf79cb9c1756f794b4f5c77b058d09e713f7b364.tar.gz emacs-cf79cb9c1756f794b4f5c77b058d09e713f7b364.zip | |
merge from trunk
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0c8791d8af7..11e5e913398 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-08-13 Fabián Ezequiel Gallina <fgallina@gnu.org> | ||
| 2 | |||
| 3 | * progmodes/python.el (python-imenu--build-tree) | ||
| 4 | (python-imenu--put-parent): Simplify and Fix (GH bug 146). | ||
| 5 | |||
| 1 | 2013-08-13 Xue Fuqiao <xfq.free@gmail.com> | 6 | 2013-08-13 Xue Fuqiao <xfq.free@gmail.com> |
| 2 | 7 | ||
| 3 | * simple.el (backward-word): Mention the optional argument. | 8 | * simple.el (backward-word): Mention the optional argument. |