HCoop Git - bpt/emacs.git/commit

HCoop / bpt / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5723992 711f459)

author	Chong Yidong <cyd@gnu.org>
	Sat, 11 Aug 2012 02:13:55 +0000 (10:13 +0800)
committer	Chong Yidong <cyd@gnu.org>
	Sat, 11 Aug 2012 02:13:55 +0000 (10:13 +0800)
commit	5725bd2cc0e691dadc31bd958f210b1bbcf17c49
tree	a8faec22f21eff83d918076adcc9c8c49c4cc820	tree \| snapshot (tar.gz zip)
parent	5723992258a8025e29ba9fcae923182fb5456426	commit \| diff
parent	711f4590cddbc83c509c1c5e852ef4e528a39780	commit \| diff

Merge from emacs-24; up to 2012-05-02T11:38:01Z!lekktu@gmail.com

admin/ChangeLog	diff1 \|	diff2 \|	blob \| history
admin/bzrmerge.el	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/emacs-lisp/autoload.el	diff1 \|	diff2 \|	blob \| history
lisp/emacs-lisp/copyright.el	diff1 \|	diff2 \|	blob \| history
lisp/files.el	diff1 \|	diff2 \|	blob \| history
lisp/tutorial.el	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/unexmacosx.c	diff1 \|	diff2 \|	blob \| history
test/ChangeLog	diff1 \|	diff2 \|	blob \| history
test/automated/Makefile.in	diff1 \|	diff2 \|	blob \| history

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