Fixed merged conflicts from menu branch
authorMaran <maran.hidskes@gmail.com>
Tue, 31 Jul 2012 16:20:54 +0000 (18:20 +0200)
committerMaran <maran.hidskes@gmail.com>
Tue, 31 Jul 2012 16:20:54 +0000 (18:20 +0200)
commit7dbad127435b1a06147b7d4c07946a09e22243f6
tree0d2f36bd74d7b7915a2ce780483f064512023cda
parent7682f00fb559ae41b8fa397ade7fb19d91ba2251
parentfa97acc2b47ba91c5ac049d5757f312441663f6f
Fixed merged conflicts from menu branch
lib/gui_lite.py