Merge branch 'emacs-24'.
commit0cce3623b169732a51f055a86fc926313b11a5ee
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 29 Nov 2014 06:55:31 +0000 (28 22:55 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 29 Nov 2014 07:07:16 +0000 (28 23:07 -0800)
tree17154977d6e77f604ede0b82f89b2aeb6925310a
parent9875d23d86c0668b1e697b67a394560d66c7826d
parent6b765b8facbdbb03f28028007885236601652515
Merge branch 'emacs-24'.
38 files changed:
.gitignore
ChangeLog
admin/ChangeLog
admin/notes/copyright
admin/notes/repo
autogen.sh
doc/emacs/ChangeLog
doc/emacs/maintaining.texi
doc/lispref/ChangeLog
etc/ChangeLog
etc/PROBLEMS
lisp/ChangeLog
lisp/ChangeLog.12
lisp/ChangeLog.14
lisp/ChangeLog.15
lisp/ChangeLog.16
lisp/ChangeLog.7
lisp/calendar/diary-lib.el
lisp/erc/ChangeLog
lisp/gnus/ChangeLog
lisp/gnus/ChangeLog.2
lisp/gnus/auth-source.el
lisp/mh-e/ChangeLog
lisp/net/tramp-sh.el
lisp/org/ChangeLog
lisp/progmodes/python.el
lisp/vc/vc-bzr.el
lisp/vc/vc-git.el
lisp/vc/vc-hg.el
lisp/vc/vc.el
nt/ChangeLog
src/ChangeLog
src/Makefile.in
src/keyboard.c
src/w32fns.c
src/xdisp.c
test/ChangeLog
test/automated/python-tests.el