]> git.eshelyaron.com Git - emacs.git/commit
Merge branch 'trunk' into xwidget
authorJoakim Verona <joakim@verona.se>
Fri, 19 Jul 2013 23:44:36 +0000 (01:44 +0200)
committerJoakim Verona <joakim@verona.se>
Fri, 19 Jul 2013 23:44:36 +0000 (01:44 +0200)
commit759dbb1aebe68fb392f7ed53eba4b460ae6b83be
tree1becc0cc6d676589eb274cb2c457e4256e908010
parent6c1769c85ecb61b40a1f9a3b56b61cdd6c1f8992
parent3f5bef16fab0ba83cb2298f8137fec831af1aec4
Merge branch 'trunk' into xwidget
lisp/desktop.el
src/buffer.c
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