]> git.eshelyaron.com Git - emacs.git/commitdiff
merge master
authorJoakim Verona <joakim@verona.se>
Fri, 16 Jan 2015 21:29:10 +0000 (22:29 +0100)
committerJoakim Verona <joakim@verona.se>
Fri, 16 Jan 2015 21:29:10 +0000 (22:29 +0100)
1  2 
configure.ac
src/lisp.h
src/window.c
src/xdisp.c

diff --cc configure.ac
Simple merge
diff --cc src/lisp.h
Simple merge
diff --cc src/window.c
Simple merge
diff --cc src/xdisp.c
Simple merge