]> git.eshelyaron.com Git - emacs.git/commitdiff
merge from trunk
authorJoakim Verona <joakim@verona.se>
Wed, 11 Sep 2013 05:34:43 +0000 (07:34 +0200)
committerJoakim Verona <joakim@verona.se>
Wed, 11 Sep 2013 05:34:43 +0000 (07:34 +0200)
1  2 
src/keyboard.c
src/lisp.h

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