]> code.delx.au - gnu-emacs/commit
Merge branch 'master' into xwidget
authorJoakim Verona <joakim@verona.se>
Tue, 23 Dec 2014 16:03:28 +0000 (17:03 +0100)
committerJoakim Verona <joakim@verona.se>
Tue, 23 Dec 2014 16:03:28 +0000 (17:03 +0100)
commit5f46725992bf26f887483c14c63c03f5b5794f34
tree2896a2b98a65851eaddba81d0138fe5647005b08
parent1d8b8a2d8f75d1e3ec9eb109e98720bd9a197bec
parente3040f2aee768655198dd6f979a1ff3a72d17d16
Merge branch 'master' into xwidget
19 files changed:
configure.ac
lisp/desktop.el
lisp/progmodes/cc-mode.el
lisp/vc/vc-dir.el
make-dist
nt/INSTALL.OLD
src/.gdbinit
src/Makefile.in
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