]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge branch 'master' into xwidget
authorJoakim Verona <joakim@verona.se>
Tue, 27 Jan 2015 19:38:56 +0000 (20:38 +0100)
committerJoakim Verona <joakim@verona.se>
Tue, 27 Jan 2015 19:38:56 +0000 (20:38 +0100)
1  2 
src/dispextern.h
src/xdisp.c

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