]> code.delx.au - gnu-emacs/commitdiff
Merge branch 'master' into xwidget
authorjave <joakim@verona.se>
Mon, 5 Jan 2015 13:12:26 +0000 (14:12 +0100)
committerjave <joakim@verona.se>
Mon, 5 Jan 2015 13:12:26 +0000 (14:12 +0100)
1  2 
src/window.c

diff --cc src/window.c
Simple merge