Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:Flamefire/Vocaluxe into develop

Browse Source 
Conflicts:
	Vocaluxe/Base/CPlaylists.cs
	Vocaluxe/Base/CProfiles.cs
	Vocaluxe/Base/CSettings.cs
This commit is contained in:
Florian Küpper committed 2013-09-15 15:15:10 +02:00
2 parents 0f0776a99e 762d2c80d2
commit 0400a02bc1
89 files changed
+1500 -1354
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

VocaluxeLib/VocaluxeLib.csproj
+7
View File
@@ -158,6 +158,10 @@
<Compile Include="Menu\IMenuElement.cs" />
<Compile Include="Profile\CAvatar.cs" />
<Compile Include="Profile\CProfile.cs" />
<Compile Include="Songs\CLineBase.cs" />
<Compile Include="Songs\CBaseNote.cs" />
<Compile Include="Songs\CSongLine.cs" />
<Compile Include="Songs\CSongNote.cs" />
<Compile Include="Songs\CNotes.cs" />
<Compile Include="Menu\SingNotes\CSingNotes.cs" />
<Compile Include="Menu\SingNotes\CSingNotesClassic.cs" />
@@ -170,6 +174,9 @@
<Compile Include="Menu\SongMenu\CSongMenuList.cs" />
<Compile Include="Menu\SongMenu\CSongMenuTileBoard.cs" />
<Compile Include="Menu\SongMenu\ISongMenu.cs" />
<Compile Include="Songs\CSungLine.cs" />
<Compile Include="Songs\CSungNote.cs" />
<Compile Include="Songs\CVoice.cs" />
<Compile Include="Structs.cs" />
<Compile Include="PartyModes\CPartyMode.cs" />
<Compile Include="PartyModes\CPartyModeNone.cs" />