merge master
commitdb4613576d3115aa320f0293d081ce98baa06acd
authorjave <joakim@verona.se>
Fri, 2 Jan 2015 15:30:55 +0000 (2 16:30 +0100)
committerjave <joakim@verona.se>
Fri, 2 Jan 2015 15:30:55 +0000 (2 16:30 +0100)
tree829968643b451bd3f64c791e4d3a6c928010e14c
parentc089503bac34376e75ae6f1d2c289fc8c9f42b8f
parentd0ca1148fe2d1e72e86f0197731071f139c143e3
merge master
16 files changed:
configure.ac
lisp/net/browse-url.el
src/Makefile.in
src/buffer.c
src/dispextern.h
src/dispnew.c
src/emacs.c
src/emacsgtkfixed.c
src/emacsgtkfixed.h
src/keyboard.c
src/lisp.h
src/print.c
src/termhooks.h
src/window.c
src/xdisp.c
src/xterm.c