merge from upstream
commit13cfe8df462ab8da9f0028e16cc84dcaceaca3d1
authorJoakim Verona <joakim@verona.se>
Mon, 18 Oct 2010 20:05:07 +0000 (18 22:05 +0200)
committerJoakim Verona <joakim@verona.se>
Mon, 18 Oct 2010 20:05:07 +0000 (18 22:05 +0200)
tree723f254768f9e503504ab4c8b68801f80a56591a
parent35f4b80a934b299b3b18e62f5db44f64c240e65b
parente48eb34332dc91de823314090451459ba2ffacbf
merge from upstream
14 files changed:
configure
configure.in
src/Makefile.in
src/dispextern.h
src/dispnew.c
src/emacs.c
src/frame.h
src/gtkutil.c
src/insdel.c
src/keyboard.c
src/termhooks.h
src/window.c
src/xdisp.c
src/xterm.c