Merge remote-tracking branch 'remotes/flokuep/release-0.3' into develop

Conflicts:
	Vocaluxe/Base/CDataBase.cs
This commit is contained in:
Flamefire committed 2013-08-22 00:43:53 +02:00
commit cd826bdafd
20 files changed
+267 -126

No files matched your search

+1 -1
View File
@@ -25,7 +25,7 @@ namespace VocaluxeLib.PartyModes
{
public abstract class CPartyMode : IPartyMode
{
protected string _Folder;
private string _Folder;
protected SScreenSongOptions _ScreenSongOptions;
protected readonly Dictionary<string, CMenuParty> _Screens;