Merge branch 'maint'
authorJohnathan Corgan <jcorgan@corganenterprises.com>
Thu, 22 Jul 2010 01:29:48 +0000 (18:29 -0700)
committerJohnathan Corgan <jcorgan@corganenterprises.com>
Thu, 22 Jul 2010 01:29:48 +0000 (18:29 -0700)
commit9df7bb4aafc6196f15d2d2b4f4458368c6a685e8
treee9623a3af4bcc24e1a34c4fe6f6977921f0ecab1
parentf7a2b8b09bf8d30534dd2d7546a7300e2f358595
parent1620ab8499a7854ff1248a94782a800fb016d1f2
Merge branch 'maint'

* maint:
  wxgui: fix to use wx.Colour which is the actual name of the class (wx python wrapper may be missing wx.Color wrapper)