Commit Graph
3 Commits
Author SHA1 Message Date
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
Stephan Sundermann 0c03cc3ce7 Added converted language files 2013-01-06 12:31:19 +01:00
Alexander Eckart a00feffc81 renamed Deutsch.xml to German.xml 2013-01-05 13:46:27 +01:00