Merge branch 'alpha' of tomsrv:tomamp into alpha
authortmarki <tmarki@gmail.com>
Fri, 20 Aug 2010 12:07:49 +0000 (14:07 +0200)
committertmarki <tmarki@gmail.com>
Fri, 20 Aug 2010 12:07:49 +0000 (14:07 +0200)
commit61c90b6a13ee2b25fa08d9322ed8bf0597ee2cde
tree36a353dc135241ce15353c514644077a3d97153f
parentca8fa8c30a4fe35b0bcd442ba6d5808bf96198d9
parent8909a2735c513038eafc956e16ce38e31aa96062
Merge branch 'alpha' of tomsrv:tomamp into alpha
tomamp/mainwindow.cpp
tomamp/playlistmanager.cpp