Merge branch 'master' into xwidget
commit2a9de013720d8505369b42c7c110116ec822281f
authorJoakim Verona <joakim@verona.se>
Tue, 27 Jan 2015 19:38:56 +0000 (27 20:38 +0100)
committerJoakim Verona <joakim@verona.se>
Tue, 27 Jan 2015 19:38:56 +0000 (27 20:38 +0100)
treebe63a5b56d96c1b943311be2419064f5a2f387eb
parentd464b0ee300a1919f4398195974396e3e3d66d57
parentbd7a1e1564d04d7ea9c7f6587ffcf02ef8975512
Merge branch 'master' into xwidget
src/dispextern.h
src/xdisp.c