]> git.eshelyaron.com Git - emacs.git/commit
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)
commit681bd2a1dd602397646a7382ae72c5f622c0946c
treed057b7f9d7a2aba40d2823eb7f999672433435b2
parentac845636437cfd96001525f7f090ec0dc336731e
parentebb99847285bca912e04f79dd3d9dcc84769ccf6
merge from trunk
src/keyboard.c
src/lisp.h