Merge branch 'master' into tmp
authorAndrew Chadwick <andrewc-git@piffle.org>
Thu, 28 Feb 2013 14:51:08 +0000 (14:51 +0000)
committerAndrew Chadwick <andrewc-git@piffle.org>
Thu, 28 Feb 2013 14:51:08 +0000 (14:51 +0000)
commit91e00a5bc95bf138c4f6d02768fe26a7221e1494
tree048f306a163f771484a6ce3e58c84dc628797336
parent80e09e129487458b238afb011258f8365d662f30
parent038e161a7223532a4422291269610b2ed9e3039f
Merge branch 'master' into tmp
gui/application.py
gui/tileddrawwidget.py