]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c3aad7 1c72afb)
Merge branch 'project-next'
authorDmitry Gutov <dgutov@yandex.ru>
Tue, 10 Nov 2015 00:47:46 +0000 (02:47 +0200)
committerDmitry Gutov <dgutov@yandex.ru>
Tue, 10 Nov 2015 00:47:46 +0000 (02:47 +0200)
1  2 
lisp/progmodes/elisp-mode.el patch | diff1 | diff2 | blob | history
lisp/vc/vc.el patch | diff1 | diff2 | blob | history
test/automated/cl-lib-tests.el patch | diff1 | diff2 | blob | history

diff --cc lisp/progmodes/elisp-mode.el
Simple merge
diff --cc lisp/vc/vc.el
Simple merge
diff --cc test/automated/cl-lib-tests.el
Simple merge