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: eca1ea9 edfdb22)

author	Glenn Morris <rgm@gnu.org>
	Mon, 10 Nov 2014 07:39:35 +0000 (23:39 -0800)
committer	Glenn Morris <rgm@gnu.org>
	Mon, 10 Nov 2014 07:39:35 +0000 (23:39 -0800)
commit	c832df2ec2f6528bc35f69f9fd9a4b2e470d2ebe
tree	98a77f1acdac589d1be95dea128af1af7e8dc286	tree
parent	eca1ea96559e04e18a62a61208d501c557dd4cab	commit \| diff
parent	edfdb22f674312389ccf5d5e37efa4d3f1516994	commit \| diff

Merge from emacs-24; up to 117698

admin/ChangeLog	diff1 \|	diff2 \|	blob \| history
admin/unidata/Makefile.in	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/erc/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/startup.el	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/fileio.c	diff1 \|	diff2 \|	blob \| history
src/nsterm.h	diff1 \|	diff2 \|	blob \| history
src/nsterm.m	diff1 \|	diff2 \|	blob \| history