Merge branch 'alpha' of tomsrv:tomamp into alpha
authortmarki <tmarki@gmail.com>
Thu, 19 Aug 2010 15:58:25 +0000 (17:58 +0200)
committertmarki <tmarki@gmail.com>
Thu, 19 Aug 2010 15:58:25 +0000 (17:58 +0200)
commitc40f61e69a6651281fcd5b72f371e493948808a2
treebc43539176725443574cdcd04e87b4abb18acdf1
parent0dc07e4a7de165ca4393a49acb39427b327c8736
parentb2db6f73c47d3c3ec7a8174275fefeb20130c8ae
Merge branch 'alpha' of tomsrv:tomamp into alpha
tomamp/mainwindow.cpp
tomamp/mainwindow.h
tomamp/playlistmanager.cpp