Merge branch 'master' into split-view split-view
authorAndrew Chadwick <andrewc-git@piffle.org>
Wed, 10 Aug 2011 21:05:44 +0000 (22:05 +0100)
committerAndrew Chadwick <andrewc-git@piffle.org>
Wed, 10 Aug 2011 21:05:44 +0000 (22:05 +0100)
commitbe7a68c11afbe98a906da3f47bf0990d79ef69af
treed8b5d275f887098f7eb10bddbf930648aa1ec0ce
parent50b63fefdb35d054a3097cac2865541c49ae9908
parent2157d3fe562eb5c5a3530d65df4d5acb272ac841
Merge branch 'master' into split-view
gui/drawwindow.py