Alexander Eckart 74313cf1bd Merge branch 'develop' into medley ...

Conflicts:
	Output/Themes/Ambient/Skin Blue.xml
	Output/Themes/Ambient/Skin Green.xml
	Output/Themes/Ambient/Skin Red.xml
	Output/Themes/Ambient/Skin Yellow.xml
	Vocaluxe/Screens/CPopupScreenPlayerControl.cs

2012-06-24 21:23:50 +02:00

..

Ambient

Merge branch 'develop' into medley

2012-06-24 21:23:50 +02:00

Changelog

Merge branch 'develop' into medley

2012-06-24 21:23:50 +02:00

Ambient.xml

added HAlign to texts

2012-06-21 18:01:28 +02:00