diff options
| author | Chong Yidong | 2012-07-28 23:12:12 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-07-28 23:12:12 +0800 |
| commit | 8c74a125c85da08e34dceedb271b71b5f09ce690 (patch) | |
| tree | 338a380b3bb95e05923b6b76ae871161863ed84f /lisp/ChangeLog | |
| parent | 1eee634131dea9cf32d6ab83a06c0776b680fe8e (diff) | |
| parent | a55739d3d02606d60f511b1ce558dd503b69acba (diff) | |
| download | emacs-8c74a125c85da08e34dceedb271b71b5f09ce690.tar.gz emacs-8c74a125c85da08e34dceedb271b71b5f09ce690.zip | |
Merge from emacs-24 branch; up to 2012-05-01T18:47:23Z!rgm@gnu.org
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f31218506ba..24477cf87ea 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,13 @@ | |||
| 1 | 2012-07-28 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * progmodes/gdb-mi.el (gdb-place-breakpoints): Fix the call to | ||
| 4 | gdb-get-location. | ||
| 5 | |||
| 6 | 2012-07-25 Leo Liu <sdl.web@gmail.com> | ||
| 7 | |||
| 8 | * progmodes/cc-menus.el (cc-imenu-objc-function): Avoid leaving nil in | ||
| 9 | the alist (bug#12029). | ||
| 10 | |||
| 1 | 2012-07-28 Eli Zaretskii <eliz@gnu.org> | 11 | 2012-07-28 Eli Zaretskii <eliz@gnu.org> |
| 2 | 12 | ||
| 3 | * makefile.w32-in (custom-deps, finder-data, updates, compile) | 13 | * makefile.w32-in (custom-deps, finder-data, updates, compile) |