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

Merge remote-tracking branch 'remotes/flokuep/Font_Rewrite' into develop

Browse Source 
Conflicts:
	Vocaluxe/Base/CBackgroundMusic.cs
	Vocaluxe/Base/CMain.cs
	Vocaluxe/Base/CTheme.cs
	Vocaluxe/Base/Font/CGlyph.cs
	Vocaluxe/Lib/Draw/CDirect3D.cs
	Vocaluxe/Lib/Draw/CDrawWinForm.cs
	Vocaluxe/Lib/Draw/COpenGL.cs
	Vocaluxe/Program.cs
	Vocaluxe/Screens/CScreenCredits.cs
	Vocaluxe/Screens/CScreenMain.cs
	Vocaluxe/Screens/CScreenOptionsTheme.cs
	Vocaluxe/Screens/CScreenSing.cs
	Vocaluxe/Vocaluxe.csproj
	VocaluxeLib/Menu/IMenu.cs
This commit is contained in:
Alexander Eckart committed 2013-05-10 19:28:20 +02:00
2 parents 53a917d5f2 2a83c78692
commit 4161652a1d
57 files changed
+1803 -2146
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Vocaluxe/Program.cs
+1 -1
View File
@@ -25,7 +25,7 @@ using System.Reflection;
using System.Windows.Forms;
using Vocaluxe.Base;
using System.Runtime.ExceptionServices;
using Vocaluxe.Base.Font;
using Vocaluxe.Base.Fonts;
using Vocaluxe.Base.Server;
namespace Vocaluxe