Flamefire
73e4a9fa74
Merge branch 'release-0.3' into develop
Conflicts:
Vocaluxe/Base/CConfig.cs
Vocaluxe/Lib/Playlist/CPlaylistFile.cs
Vocaluxe/Screens/CScreenSong.cs
VocaluxeLib/CHelper.cs
VocaluxeLib/Menu/CMenu.cs
VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
2013-10-19 00:42:56 +02:00
..
2013-09-20 18:09:32 +02:00
2013-09-20 18:09:32 +02:00
2013-10-19 00:42:56 +02:00
2013-09-20 18:09:32 +02:00
2013-10-19 00:42:56 +02:00
2013-09-20 18:09:32 +02:00
2013-10-19 00:42:56 +02:00
2013-09-20 18:09:32 +02:00
2013-10-19 00:42:56 +02:00
2013-09-20 18:09:32 +02:00
2013-09-20 18:09:32 +02:00
2013-10-14 21:55:26 +02:00
2013-09-20 18:09:32 +02:00
2013-10-19 00:42:56 +02:00
2013-03-22 23:17:33 +01:00
2013-09-20 18:09:32 +02:00
2013-10-11 20:25:05 +02:00