Alexander Eckart
4161652a1d
Merge remote-tracking branch 'remotes/flokuep/Font_Rewrite' into develop
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
2013-05-10 19:28:20 +02:00
..
2013-05-06 23:18:02 +02:00
2013-05-06 23:18:02 +02:00
2013-04-23 14:52:51 +02:00
2013-04-30 15:12:36 +02:00
2013-04-23 14:52:51 +02:00
2013-04-18 15:09:21 +02:00
2013-05-10 19:28:20 +02:00
2013-05-02 02:33:39 +02:00
2013-04-23 22:14:53 +02:00
2013-05-10 00:10:12 +02:00
2013-04-23 22:11:32 +02:00
2013-04-23 14:22:42 +02:00
2013-04-29 16:14:24 +02:00
2013-05-06 23:18:02 +02:00
2013-04-23 14:52:51 +02:00
2013-05-01 22:14:34 +02:00
2013-04-28 14:02:27 +02:00
2013-05-04 11:16:41 +02:00
2013-05-07 00:23:44 +02:00
2013-04-18 15:09:21 +02:00