Merge branch 'alpha' of tomsrv:tomamp into alpha

author tmarki <tmarki@gmail.com>

Thu, 19 Aug 2010 15:58:25 +0000 (17:58 +0200)

committer tmarki <tmarki@gmail.com>

Thu, 19 Aug 2010 15:58:25 +0000 (17:58 +0200)
author tmarki <tmarki@gmail.com>
Thu, 19 Aug 2010 15:58:25 +0000 (17:58 +0200)
committer tmarki <tmarki@gmail.com>
Thu, 19 Aug 2010 15:58:25 +0000 (17:58 +0200)
diff --cc tomamp/mainwindow.cpp
Simple merge
diff --cc tomamp/mainwindow.h
Simple merge
diff --cc tomamp/playlistmanager.cpp
Simple merge
author	tmarki <tmarki@gmail.com>
	Thu, 19 Aug 2010 15:58:25 +0000 (17:58 +0200)
committer	tmarki <tmarki@gmail.com>
	Thu, 19 Aug 2010 15:58:25 +0000 (17:58 +0200)
		1	2
tomamp/mainwindow.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
tomamp/mainwindow.h	patch \|	diff1 \|	diff2 \|	blob \| history
tomamp/playlistmanager.cpp	patch \|	diff1 \|	diff2 \|	blob \| history