]> git.eshelyaron.com Git - emacs.git/commit
Merge branch 'trunk' into xwidget
authorJoakim Verona <joakim@verona.se>
Sun, 14 Jul 2013 09:04:49 +0000 (11:04 +0200)
committerJoakim Verona <joakim@verona.se>
Sun, 14 Jul 2013 09:04:49 +0000 (11:04 +0200)
commit0bb9bb0841d89fff09820a57369df4cb01b16b43
tree832bf9fa8415eef0ce464d22b3ee1300cfa90bb1
parent3718127221fbbc31f8ebd027ab7c95403dbe9118
parent3af1c8684ed6e48fbc21481d129e9aa164752c6e
Merge branch 'trunk' into xwidget

Conflicts:
src/xdisp.c
13 files changed:
configure.ac
lisp/desktop.el
src/buffer.c
src/dispextern.h
src/dispnew.c
src/emacs.c
src/keyboard.c
src/lisp.h
src/print.c
src/termhooks.h
src/window.c
src/xdisp.c
src/xterm.c