Merge branch 'master' into split-view
authorAndrew Chadwick <andrewc-git@piffle.org>
Tue, 2 Aug 2011 23:02:57 +0000 (00:02 +0100)
committerAndrew Chadwick <andrewc-git@piffle.org>
Tue, 2 Aug 2011 23:02:57 +0000 (00:02 +0100)
commit50b63fefdb35d054a3097cac2865541c49ae9908
treed89ce72d22380e59e1a4a30bf412449e10200e87
parent5b39dafceae0c42e76c949a7e79fa8c3ea3197cd
parentc32b568d39acae6f512543bb6646b675d67d2e57
Merge branch 'master' into split-view
gui/application.py
gui/drawwindow.py