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
..
2012-12-14 21:33:06 +01:00
2013-10-19 00:42:56 +02:00
2013-02-22 22:10:51 +01:00
2013-10-12 21:50:39 +02:00
2013-10-19 00:42:56 +02:00
2013-09-20 18:09:32 +02:00
2012-02-19 14:46:36 +01:00
2013-10-19 00:42:56 +02:00
2013-10-13 00:27:03 +02:00
2013-01-06 12:30:23 +01:00
2013-04-06 19:01:22 +02:00
2013-10-03 13:23:49 +02:00
2013-09-20 18:09:32 +02:00
2013-09-20 18:09:32 +02:00
2013-10-03 13:26:00 +02:00
2013-03-22 23:17:33 +01:00
2013-10-03 13:23:49 +02:00
2012-02-19 14:46:36 +01:00