Revert "Revert PartyNames-changes on develop-branch."

This reverts commit 43545ac47f.

Conflicts:
	VocaluxeLib/Menu/CNameSelection.cs
This commit is contained in:
Florian Küpper committed 2013-12-26 13:02:06 +01:00
1 parent 341f03714e
commit d24c47012c
24 files changed
+1351 -1112

No files matched your search

@@ -148,8 +148,11 @@
<ScrollUp>ScrollUp.png</ScrollUp>
<ScrollDown>ScrollDown.png</ScrollDown>
<Invisible>Invisible.png</Invisible>
<PlayerSelector>PlayerSelector.png</PlayerSelector>
<Plus>Plus.png</Plus>
<Minus>Minus.png</Minus>
</Skins>
<Videos>
<BG_Video>[Blue]BG_Video.mp4</BG_Video>
</Videos>
</root>
</root>