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

Merge branch 'develop' of git://github.com/KoMaDoctors/Vocaluxe into SongListView

Browse Source 
Conflicts:
	Vocaluxe/Base/CConfig.cs
	VocaluxeLib/Menu/SongMenu/CSongMenu.cs
This commit is contained in:
Flamefire committed 2014-12-09 21:49:33 +01:00
2 parents 7e104f7167 b4414cf08f
commit 20b2e735ec
5 files changed
+664 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

VocaluxeLib/VocaluxeLib.csproj
+1
View File
@@ -117,6 +117,7 @@
<Compile Include="Enums.cs" />
<Compile Include="Menu\IMenu.cs" />
<Compile Include="Menu\IMenuElement.cs" />
<Compile Include="Menu\SongMenu\CSongMenuListAndCover.cs" />
<Compile Include="Profile\CAvatar.cs" />
<Compile Include="Profile\CProfile.cs" />
<Compile Include="Songs\CLineBase.cs" />