Merge branch 'challenge' of github.com:Vocaluxe/Vocaluxe into challenge

Conflicts: Output/PartyModes/Challenge/Screens/PartyScreenChallengeNames.xml
2012-12-15 22:26:34 +01:00
commit 60ae51ff90
@@ -115,7 +115,7 @@
        <Height>26</Height>
      </SReflection>
    </ButtonNext>
-	<ButtonExit>
+	<ButtonBack>
      <!--<Skin>: Texture name-->
      <Skin>Button</Skin>
      <!--<SkinSelected>: Texture name for selected button-->
@@ -171,7 +171,7 @@
        <Space>10</Space>
        <Height>26</Height>
      </SReflection>
-    </ButtonExit>
+    </ButtonBack>
    <NameSelection>
      <!--<X>, <Y>, <Z>, <W>, <H>: NameSelection position, width and height-->
      <X>172</X>