diff options
| author | Glenn Morris | 2011-05-04 23:25:24 -0700 |
|---|---|---|
| committer | Glenn Morris | 2011-05-04 23:25:24 -0700 |
| commit | 40c67c6dee51662ef7c12ca6615e68eaa7ae56ef (patch) | |
| tree | 22bd7001ac6685845d3ed2ce1615da9e680da0ea | |
| parent | 000d802eceff14e213404785dde809a2cf5fc3e2 (diff) | |
| download | emacs-40c67c6dee51662ef7c12ca6615e68eaa7ae56ef.tar.gz emacs-40c67c6dee51662ef7c12ca6615e68eaa7ae56ef.zip | |
ChangeLog merge fix, grumble.
| -rw-r--r-- | lisp/ChangeLog | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f1376884e9d..7a491bd8fa0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,8 +1,3 @@ | |||
| 1 | 2011-05-05 Daniel Colascione <dan.colascione@gmail.com> | ||
| 2 | |||
| 3 | * progmodes/cc-engine.el (c-forward-decl-or-cast-1): Use | ||
| 4 | correct match group (bug#8438). | ||
| 5 | |||
| 6 | 2011-05-05 Stefan Monnier <monnier@iro.umontreal.ca> | 1 | 2011-05-05 Stefan Monnier <monnier@iro.umontreal.ca> |
| 7 | 2 | ||
| 8 | Fix earlier half-done eieio-defmethod change (bug#8338). | 3 | Fix earlier half-done eieio-defmethod change (bug#8338). |