Merge branch 'alpha' of tomsrv:tomamp into alpha
authortmarki <tmarki@gmail.com>
Thu, 12 Aug 2010 23:07:35 +0000 (01:07 +0200)
committertmarki <tmarki@gmail.com>
Thu, 12 Aug 2010 23:07:35 +0000 (01:07 +0200)
commit1469415b19b7f32ccc5f4cdde5049892ae1cfa30
treeddd36f0886d31d70873dae8751627a53e53dfd84
parentfec916cdee3b3cc9a22019ccb8d0a6199e4be5db
parent4095d2c5f4b8e4112c75152aefc34969d34c14db
Merge branch 'alpha' of tomsrv:tomamp into alpha
tomamp/mainwindow.cpp
tomamp/mainwindow.h
tomamp/optiondialog.cpp
tomamp/optiondialog.h