]> git.eshelyaron.com Git - emacs.git/commit
Merge remote-tracking branch 'origin/master' into xwidget_mvp
authorJoakim Verona <joakim@verona.se>
Tue, 28 Apr 2015 16:24:03 +0000 (18:24 +0200)
committerJoakim Verona <joakim@verona.se>
Tue, 28 Apr 2015 16:24:03 +0000 (18:24 +0200)
commit5cefb1b7afd86ccd72528f9adc10603847decc9d
treef7298da21542d77f68b89c7fb017c235a2baa173
parentc39847c585f3f411b04d22f14e6c03e84d38a83b
parente78aef008332477d568e904de3646cfc1ba68cbf
Merge remote-tracking branch 'origin/master' into xwidget_mvp

Conflicts:
src/print.c
src/keyboard.c
src/print.c
src/xdisp.c
src/xterm.c