Files
Vocaluxe/Output/PartyModes
Stephan Sundermann 99a1bdcf8b Merge remote-tracking branch 'remotes/upstream/develop' into develop
Conflicts:
	Output/Languages/German.xml
	Output/PartyModes/Challenge/Languages/German.xml
	Output/PartyModes/ChallengeMedley/Languages/German.xml
	Output/PartyModes/TicTacToe/Languages/German.xml
2013-01-06 20:35:43 +01:00
..