]> git.eshelyaron.com Git - emacs.git/commit
Merge emacs-25 into master (using imerge)
authorJohn Wiegley <johnw@newartisans.com>
Wed, 30 Dec 2015 05:40:28 +0000 (21:40 -0800)
committerJohn Wiegley <johnw@newartisans.com>
Wed, 30 Dec 2015 05:40:28 +0000 (21:40 -0800)
commit9f2f14a0725211b13a744573344636b57b9c98b9
tree7190e0fb3d4aa06018d8cf997f06b806fb09a9c8
parentd259328fb87db8cc67d52771efcfa653e52c5b71
parente823c34072bf045800d91e12c7ddb61fa23c6e30
Merge emacs-25 into master (using imerge)
55 files changed:
.gitignore
CONTRIBUTE
ChangeLog.2
admin/release-process
configure.ac
doc/lispref/os.texi
etc/NEWS
lisp/emacs-lisp/eieio-compat.el
lisp/emacs-lisp/let-alist.el
lisp/emacs-lisp/package.el
lisp/erc/erc-backend.el
lisp/erc/erc.el
lisp/gnus/gnus-util.el
lisp/htmlfontify.el
lisp/ibuffer.el
lisp/loadup.el
lisp/mail/rmail.el
lisp/menu-bar.el
lisp/net/eww.el
lisp/net/shr.el
lisp/progmodes/cc-defs.el
lisp/progmodes/verilog-mode.el
lisp/ps-print.el
lisp/textmodes/reftex-auc.el
lisp/url/url-handlers.el
lisp/url/url-http.el
lisp/url/url-util.el
src/Makefile.in
src/emacs.c
src/keyboard.c
src/lisp.h
test/lisp/abbrev-tests.el
test/lisp/autorevert-tests.el
test/lisp/calendar/icalendar-tests.el
test/lisp/character-fold-tests.el
test/lisp/emacs-lisp/package-tests.el
test/lisp/faces-tests.el
test/lisp/gnus/auth-source-tests.el
test/lisp/gnus/message-tests.el
test/lisp/help-fns-tests.el
test/lisp/json-tests.el
test/lisp/net/tramp-tests.el
test/lisp/progmodes/elisp-mode-tests.el
test/lisp/simple-tests.el
test/lisp/subr-tests.el
test/manual/etags/CTAGS.good
test/manual/etags/ETAGS.good_1
test/manual/etags/ETAGS.good_2
test/manual/etags/ETAGS.good_3
test/manual/etags/ETAGS.good_4
test/manual/etags/ETAGS.good_5
test/manual/etags/ETAGS.good_6
test/manual/etags/Makefile
test/manual/indent/js.js
test/src/keymap-tests.el