Merge remote-tracking branch 'remotes/vocaluxe/develop' into medley

Conflicts:
	Vocaluxe/Lib/Song/CSong.cs
	Vocaluxe/Menu/CInteraction.cs
	Vocaluxe/Menu/CMenu.cs
This commit is contained in:
Alexander Eckart committed 2012-08-12 14:37:08 +02:00
commit dcafc3dae5
29 files changed
+1881 -144

No files matched your search

@@ -1,5 +1,11 @@
ScreenSing
+++++++++
Version 5
Add:
<TextDuetName1> and <TextDuetName2> (only showed when sining duet)
++++++++++
Version 5: