git.eshelyaron.com Git - emacs.git/commit

]> git.eshelyaron.com Git - emacs.git/commit

projects / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: cecc25c de33360)

author	Alan Mackenzie <acm@muc.de>
	Sun, 5 Feb 2017 16:28:53 +0000 (16:28 +0000)
committer	Alan Mackenzie <acm@muc.de>
	Sun, 5 Feb 2017 16:28:53 +0000 (16:28 +0000)
commit	d5514332d4a6092673ce1f78fadcae0c57f7be64
tree	1780337154904dcfad8ecfa76614b47c082160dd	tree \| snapshot
parent	cecc25c68f5a1834c356e18259aa2af402a70ce1	commit \| diff
parent	de3336051ef74e0c3069374ced5b5fc7bb9fba15	commit \| diff

Merge branch 'master' into comment-cache

doc/emacs/programs.texi	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/cc-defs.el	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/cc-engine.el	diff1 \|	diff2 \|	blob \| history
src/buffer.c	diff1 \|	diff2 \|	blob \| history
src/buffer.h	diff1 \|	diff2 \|	blob \| history
src/insdel.c	diff1 \|	diff2 \|	blob \| history
src/lisp.h	diff1 \|	diff2 \|	blob \| history
src/syntax.c	diff1 \|	diff2 \|	blob \| history
src/syntax.h	diff1 \|	diff2 \|	blob \| history
src/textprop.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.