]> git.eshelyaron.com Git - emacs.git/commitdiff
merge from trunk
authorJoakim Verona <joakim@verona.se>
Wed, 14 Aug 2013 16:51:46 +0000 (18:51 +0200)
committerJoakim Verona <joakim@verona.se>
Wed, 14 Aug 2013 16:51:46 +0000 (18:51 +0200)
1  2 
src/lisp.h
src/xterm.c

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