]> code.delx.au - gnu-emacs/commit
Merge branch 'trunk' into xwidget
authorJoakim Verona <joakim@verona.se>
Wed, 12 Jun 2013 10:32:25 +0000 (12:32 +0200)
committerJoakim Verona <joakim@verona.se>
Wed, 12 Jun 2013 10:32:25 +0000 (12:32 +0200)
commite6fa6da6899bf1b4877b96c450eae3934085d560
tree48e6fda463d24a792ec8428fb8044a250ee2ff82
parent4f0994366d33f8f76db4662cc126720866df3461
parent84d6f46535554f9f51aae3314313112e8d755c65
Merge branch 'trunk' into xwidget

Conflicts:
src/Makefile.in
src/keyboard.c
src/termhooks.h
configure.ac
lisp/progmodes/cc-mode.el
src/Makefile.in
src/dispextern.h
src/emacs.c
src/keyboard.c
src/lisp.h
src/termhooks.h
src/window.c
src/xdisp.c