Merge branch 'FFMpeg_Video_Improvement' into develop

This commit is contained in:
Flamefire committed 2013-05-27 19:02:56 +02:00
commit 8574314fa5
16 files changed
+475 -772

No files matched your search

+1 -1
View File
@@ -137,7 +137,7 @@ namespace VocaluxeLib.Menu
_ThemeScreenSettings = null;
}
protected void _FadeTo(EScreens nextScreen)
protected static void _FadeTo(EScreens nextScreen)
{
CBase.Graphics.FadeTo(nextScreen);
}
+1 -1
View File
@@ -36,7 +36,7 @@ namespace VocaluxeLib.Menu
_PartyModeID = partyModeID;
}
public void AssingPartyMode(IPartyMode partyMode)
public void AssignPartyMode(IPartyMode partyMode)
{
_PartyMode = partyMode;
}