Merge from trunk
commitf136ba7299539b9813a899f3c670a245b347b91f
authorMartin Rudalics <rudalics@gmx.at>
Fri, 2 Jul 2010 05:59:04 +0000 (2 07:59 +0200)
committerMartin Rudalics <rudalics@gmx.at>
Fri, 2 Jul 2010 05:59:04 +0000 (2 07:59 +0200)
treee059499838f9bc2e0ce7210b005521b5daea0805
parent1c06cfa6c20d8bfd14aca98d557e9ae19963d881
parentc49d071ad0904c8700dc64fff24abde0ba7d10c4
Merge from trunk
src/ChangeLog
src/window.c