Merge commit '01361983136f137361280f21fc37dc25ab9a4407' into Code_cleanup
2bb84fc28af2c492b071f. Conflicts: VocaluxeLib/Menu/IMenu.cs
This commit is contained in:
commit
7f26aa6051
57 files changed
+1760
-1416
No files matched your search
@@ -10,9 +10,8 @@
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>VocaluxeLib.PartyModes.Challenge</RootNamespace>
|
||||
<AssemblyName>Challenge</AssemblyName>
|
||||
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
|
||||
<TargetFrameworkProfile>
|
||||
</TargetFrameworkProfile>
|
||||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
||||
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin|x86' ">
|
||||
|
||||
Reference in new issue
Block a user