]> git.eshelyaron.com Git - emacs.git/commit
Merge branch 'trunk' into xwidget
authorJoakim Verona <joakim@verona.se>
Tue, 2 Jul 2013 20:46:17 +0000 (22:46 +0200)
committerJoakim Verona <joakim@verona.se>
Tue, 2 Jul 2013 20:46:17 +0000 (22:46 +0200)
commit3718127221fbbc31f8ebd027ab7c95403dbe9118
treeef422898f3344c8f94f6ecf63eb583122bbf2bd8
parent1ce45b902c67b8a0dda8d71bd2812de29a9988a6
parenta3b49114c186d84404226af75ae7905bd1cd018f
Merge branch 'trunk' into xwidget

Conflicts:
src/window.c
12 files changed:
configure.ac
lisp/desktop.el
lisp/net/browse-url.el
src/Makefile.in
src/buffer.c
src/dispextern.h
src/emacs.c
src/lisp.h
src/print.c
src/window.c
src/xdisp.c
src/xterm.c