]> git.eshelyaron.com Git - emacs.git/commit
Merge branch 'master' into xwidget_mvp
authorJoakim Verona <joakim@verona.se>
Fri, 13 Feb 2015 12:26:52 +0000 (13:26 +0100)
committerJoakim Verona <joakim@verona.se>
Fri, 13 Feb 2015 12:26:52 +0000 (13:26 +0100)
commit1ced7a25815cbe12cd15b0e6e16fb0ac5de751ce
tree528c265471799c42919c2ff029a428e8a9e8fb36
parent7dafd7edb71c870b20b983cf431856cc6d3acee2
parent69e38a5b1fdb5ac20440b6ce7ba1fc2cd575f4e6
Merge branch 'master' into xwidget_mvp

Conflicts:
src/xdisp.c
configure.ac
src/dispextern.h
src/keyboard.c
src/lisp.h
src/window.c
src/xdisp.c
src/xterm.c