diff options
| author | Jan Djärv | 2010-01-06 17:04:19 +0100 |
|---|---|---|
| committer | Jan Djärv | 2010-01-06 17:04:19 +0100 |
| commit | ea2b370da2766fed12db4e7c0f33ddce12f9d0b4 (patch) | |
| tree | b0375aa9fa396b72afeee557cd8fae59149e3e85 /lisp/ChangeLog | |
| parent | 4270727858c1c03f9df591c2fdfa0b9c3993348c (diff) | |
| parent | 4f6fc2522762546ef55e4769863a31afc068756c (diff) | |
| download | emacs-ea2b370da2766fed12db4e7c0f33ddce12f9d0b4.tar.gz emacs-ea2b370da2766fed12db4e7c0f33ddce12f9d0b4.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 2827ff8d9d5..a5569604bd8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-01-06 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * vc-bzr.el (vc-bzr-after-dir-status): Ignore pending merges. | ||
| 4 | |||
| 1 | 2010-01-05 Tom Tromey <tromey@redhat.com> | 5 | 2010-01-05 Tom Tromey <tromey@redhat.com> |
| 2 | 6 | ||
| 3 | * progmodes/python.el (python-font-lock-keywords): Handle | 7 | * progmodes/python.el (python-font-lock-keywords): Handle |