git.eshelyaron.com Git - emacs.git/commit

]> git.eshelyaron.com Git - emacs.git/commit

projects / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1a1ecd2 f122038)

author	Glenn Morris <rgm@gnu.org>
	Wed, 5 Sep 2012 07:05:56 +0000 (00:05 -0700)
committer	Glenn Morris <rgm@gnu.org>
	Wed, 5 Sep 2012 07:05:56 +0000 (00:05 -0700)
commit	7e570fbf3ef8ccd31df2651f5d2775c5697d5950
tree	2a722a870a0240ded0b1fcffb34f52a1d7d668e3	tree \| snapshot
parent	1a1ecd2b14f38fcd995516a71b49c8810eac5828	commit \| diff
parent	f1220388bca64f31182daacfb2eefcc8053af11a	commit \| diff

Merge from emacs-24; up to 2012-05-05T02:50:20Z!monnier@iro.umontreal.ca

lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/calendar/holidays.el	diff1 \|	diff2 \|	blob \| history
lisp/emulation/cua-rect.el	diff1 \|	diff2 \|	blob \| history
lisp/play/blackbox.el	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/flymake.el	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/sh-script.el	diff1 \|	diff2 \|	blob \| history
lisp/textmodes/picture.el	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.