comparison lisp/ChangeLog @ 106751:d94786c1fa6c

(vc-bzr-after-dir-status): Ignore pending merges.
author Dan Nicolaescu <dann@ics.uci.edu>
date Wed, 06 Jan 2010 07:11:52 -0800
parents 2db50e698b85
children 574dd89b7759
comparison
equal deleted inserted replaced
106747:47e4680680fe 106751:d94786c1fa6c
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
4 qualified decorators (Bug#881). 8 qualified decorators (Bug#881).
5 9