Merge branch 'startup-gui-option' into merged
authorbkkcoins <chrissavery@gmail.com>
Fri, 21 Sep 2012 08:11:24 +0000 (15:11 +0700)
committerbkkcoins <chrissavery@gmail.com>
Fri, 21 Sep 2012 08:11:24 +0000 (15:11 +0700)
1  2 
lib/gui_qt.py

diff --cc lib/gui_qt.py
Simple merge