merge masterxwidget
commit5e1d5ef39ca0d2fbff26d659f2ec6ce863b14529
authorJoakim Verona <joakim@verona.se>
Sun, 8 Feb 2015 20:55:28 +0000 (8 21:55 +0100)
committerJoakim Verona <joakim@verona.se>
Sun, 8 Feb 2015 20:55:28 +0000 (8 21:55 +0100)
tree860e0d53399626aee6249ebb5f972879f403b228
parent148262ce3db990ed16989341345e232570b3a338
parent7d631aa0ffab875e4979727f632703ad5b4100a2
merge master
configure.ac
src/dispnew.c
src/window.c
src/xdisp.c
src/xterm.c