 Florian Küpper
|
11a72e6e8d
|
Merge branch 'dbv3_DateAdded' of github.com:flokuep/Vocaluxe into release-0.3
Conflicts:
Vocaluxe/Base/CDataBase.cs
Vocaluxe/Base/CSettings.cs
VocaluxeLib/Menu/SongMenu/CSong.cs
|
2013-08-21 19:55:25 +02:00 |
|
|
Florian Küpper
|
4a91f39743
|
Read #DUETSINGERP1 and #DUETSINGERP2 from texts for better compatibility (performous uses this tags).
|
2013-08-12 10:56:32 +02:00 |
|
|
Flamefire
|
11398dbb2f
|
Cleanups after merge
|
2013-05-19 18:38:50 +02:00 |
|
|
Flamefire
|
9d13c32b93
|
Merge branch 'Better_Graphics_Handling' into develop
Conflicts:
Vocaluxe/Base/CBackgroundMusic.cs
Vocaluxe/Base/CCover.cs
Vocaluxe/Base/CDataBase.cs
Vocaluxe/Base/CDraw.cs
Vocaluxe/Base/CMain.cs
Vocaluxe/Base/CProfiles.cs
Vocaluxe/Base/CTheme.cs
Vocaluxe/Base/CVideo.cs
Vocaluxe/Base/CWebcam.cs
Vocaluxe/Base/Fonts/CFont.cs
Vocaluxe/Base/Fonts/CGlyph.cs
Vocaluxe/Lib/Draw/CDirect3D.cs
Vocaluxe/Lib/Draw/CDrawWinForm.cs
Vocaluxe/Lib/Draw/COpenGL.cs
Vocaluxe/Lib/Draw/IDraw.cs
Vocaluxe/Lib/Video/CVideoDecoder.cs
Vocaluxe/Lib/Video/CVideoDecoderFFmpeg.cs
Vocaluxe/Lib/Video/CVideoDecoderGstreamer.cs
Vocaluxe/Lib/Video/IVideoDecoder.cs
Vocaluxe/Lib/Webcam/CAForgeNet.cs
Vocaluxe/Lib/Webcam/IWebcam.cs
Vocaluxe/Screens/CScreenCredits.cs
Vocaluxe/Screens/CScreenNames.cs
Vocaluxe/Screens/CScreenOptionsVideo.cs
Vocaluxe/Screens/CScreenProfiles.cs
Vocaluxe/Screens/CScreenSing.cs
VocaluxeLib/Menu/IMenu.cs
VocaluxeLib/Songs/CCategory.cs
VocaluxeLib/Songs/CSong.cs
VocaluxeLib/Structs.cs
VocaluxeLib/VocaluxeLib.csproj
|
2013-05-19 17:53:46 +02:00 |
|
|
Alexander Eckart
|
ed3047314b
|
finished moving around
|
2013-05-06 23:18:02 +02:00 |
|
|
Alexander Eckart
|
685bc019fd
|
moved some files
|
2013-05-06 23:11:56 +02:00 |
|