Merge branch 'master' into xwidget
commitbdd672b275034e8c1c65992f2e21dac7cc6eba60
authorJoakim Verona <joakim@verona.se>
Thu, 22 Jan 2015 23:13:27 +0000 (23 00:13 +0100)
committerJoakim Verona <joakim@verona.se>
Thu, 22 Jan 2015 23:13:27 +0000 (23 00:13 +0100)
tree0e773e29ee7e4cbfb680ec31f7350643dd93366d
parent5693f3de69f9db99252b2f4eb1c7178fdec2a210
parent2f908e0cac317b381393e3efb70ec08dfaab5383
Merge branch 'master' into xwidget
src/xdisp.c