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: cc99f92 237bf45)

author	Glenn Morris <rgm@gnu.org>
	Thu, 30 Oct 2014 05:15:28 +0000 (22:15 -0700)
committer	Glenn Morris <rgm@gnu.org>
	Thu, 30 Oct 2014 05:15:28 +0000 (22:15 -0700)
commit	52b410c60aebeb769ec9580af25ca50df2a44751
tree	ba5de0b896c5ea410ceb2f2f1866c0fac73ea236	tree
parent	cc99f920f507d28bb1422f8a3d52723ddc734c8a	commit \| diff
parent	237bf45a48999d5a8a3617822dddf3ea305bc269	commit \| diff

Merge from emacs-24; up to 117634

17 files changed:

doc/emacs/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/emacs/frames.texi	diff1 \|	diff2 \|	blob \| history
doc/misc/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/misc/efaq.texi	diff1 \|	diff2 \|	blob \| history
doc/misc/eieio.texi	diff1 \|	diff2 \|	blob \| history
etc/NEWS.24	diff1 \|	\|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/emacs-lisp/bytecomp.el	diff1 \|	diff2 \|	blob \| history
lisp/emacs-lisp/cl-extra.el	diff1 \|	diff2 \|	blob \| history
lisp/erc/erc-track.el	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/cc-defs.el	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/cc-langs.el	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/compile.el	diff1 \|	diff2 \|	blob \| history
lisp/startup.el	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/dispnew.c	diff1 \|	diff2 \|	blob \| history
src/fileio.c	diff1 \|	diff2 \|	blob \| history