]> git.eshelyaron.com Git - emacs.git/commitdiff
merge master
authorJoakim Verona <joakim@verona.se>
Thu, 26 Feb 2015 13:43:51 +0000 (14:43 +0100)
committerJoakim Verona <joakim@verona.se>
Thu, 26 Feb 2015 13:43:51 +0000 (14:43 +0100)
1  2 
src/dispextern.h
src/emacs.c

Simple merge
diff --cc src/emacs.c
Simple merge