From: Mark A. Hershberger Date: Mon, 25 Jan 2010 05:03:35 +0000 (-0500) Subject: merge X-Git-Tag: emacs-pretest-23.1.92~30^2~1 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6a6d15ab4f1f004498ad7ec8c28050edd3010146;p=emacs.git merge --- 6a6d15ab4f1f004498ad7ec8c28050edd3010146 diff --cc lisp/ChangeLog index e3c34554afe,085c082cadb..84cfa2adcff --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,10 -1,8 +1,15 @@@ - 2010-01-24 Mark A. Hershberger ++2010-01-25 Mark A. Hershberger + + * progmodes/python.el: Replace reference to obsolete + c-subward-mode. + + * vc-bzr.el: (vc-bzr-revision-table) New function. + + 2010-01-25 Eric Hanchrow (tiny change) + + * vc-git.el (vc-git-dir-status-goto-stage): Pass --relative to the + diff-index command. This requires at least git-1.5.5. (Bug#1589). + 2010-01-24 Dan Nicolaescu Remove support for adding --signoff on commit.