]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge branch 'master' into comment-cache
authorAlan Mackenzie <acm@muc.de>
Fri, 23 Dec 2016 20:28:21 +0000 (20:28 +0000)
committerAlan Mackenzie <acm@muc.de>
Fri, 23 Dec 2016 20:28:21 +0000 (20:28 +0000)
1  2 
src/buffer.c
src/buffer.h

diff --cc src/buffer.c
Simple merge
diff --cc src/buffer.h
Simple merge