merge from trunk
commit5b3399e3bbd8ce641e15f3234e65b9a68940eb98
authorJoakim Verona <joakim@verona.se>
Fri, 23 Aug 2013 04:31:39 +0000 (23 06:31 +0200)
committerJoakim Verona <joakim@verona.se>
Fri, 23 Aug 2013 04:31:39 +0000 (23 06:31 +0200)
treee70cdb6b408c448d61d8a582b315cab1e2356c8f
parent87174f325be32b8967bb50a81ad8f43a9482f10f
parent6b729d1685255d309d6de0ac1c973527ec691f8b
merge from trunk
src/window.c