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: 86009dd 4f4cf9c)

author	Stefan Monnier <monnier@iro.umontreal.ca>
	Sun, 16 Nov 2014 05:22:20 +0000 (00:22 -0500)
committer	Stefan Monnier <monnier@iro.umontreal.ca>
	Sun, 16 Nov 2014 05:22:20 +0000 (00:22 -0500)
commit	9075fcc1937a211bc91e8bc49c332bc55ac99e24
tree	1cff4991107011e0b5d13fac46b0881c30d31a63	tree
parent	86009dd5d886f1101358990e4f8f69a5d1467eb8	commit \| diff
parent	4f4cf9c855f5818d4c3c0fb772db8bbcf4f33780	commit \| diff

Merge from emacs-24

15 files changed:

.gitignore	diff1 \|	diff2 \|	blob \| history
ChangeLog	diff1 \|	diff2 \|	blob \| history
admin/ChangeLog	diff1 \|	diff2 \|	blob \| history
admin/update_autogen	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/gnus/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/mail/emacsbug.el	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/python.el	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/nsfns.m	diff1 \|	diff2 \|	blob \| history
src/nsmenu.m	diff1 \|	diff2 \|	blob \| history
src/nsterm.m	diff1 \|	diff2 \|	blob \| history
src/window.c	diff1 \|	diff2 \|	blob \| history
src/window.h	diff1 \|	diff2 \|	blob \| history
test/ChangeLog	diff1 \|	diff2 \|	blob \| history