]> git.eshelyaron.com Git - emacs.git/commitdiff
auto upstream
authorJoakim Verona <joakim@verona.se>
Tue, 19 Feb 2013 23:04:24 +0000 (00:04 +0100)
committerJoakim Verona <joakim@verona.se>
Tue, 19 Feb 2013 23:04:24 +0000 (00:04 +0100)
1  2 
src/lisp.h
src/xdisp.c

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