code.delx.au - gnu-emacs/commit

]> code.delx.au - gnu-emacs/commit

delx.au / code / gnu-emacs / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7aa7fff 86b192c)

author	Xue Fuqiao <xfq.free@gmail.com>
	Tue, 30 Jul 2013 00:29:09 +0000 (08:29 +0800)
committer	Xue Fuqiao <xfq.free@gmail.com>
	Tue, 30 Jul 2013 00:29:09 +0000 (08:29 +0800)
commit	d2067333246b676fcf98567d34eec79ed4648d5f
tree	ad6543d8e7f1db50226907f7278373eef544d252	tree
parent	7aa7fff0c8860b72a2c7cdc7d4d0845245754d43	commit \| diff
parent	86b192c1479d167c13edb9cdaa026c231c8a0442	commit \| diff

Merge from mainline.

etc/NEWS	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/vc/vc-dir.el	diff1 \|	diff2 \|	blob \| history