Fix merge-errors

This commit is contained in:
Florian Küpper committed 2015-12-06 11:25:04 +01:00
1 parent 45d0091161
commit 9281cd1d35
2 files changed
+44 -11

No files matched your search

@@ -30,19 +30,19 @@ namespace VocaluxeLib.Menu.SongMenu
{
private SRectF _ScrollRect;
private List<CStatic> _Tiles;
private readonly CStatic _CoverBig;
private readonly CStatic _TextBG;
private readonly CStatic _DuetIcon;
private readonly CStatic _VideoIcon;
private readonly CStatic _MedleyCalcIcon;
private readonly CStatic _MedleyTagIcon;
private CStatic _CoverBig;
private CStatic _TextBG;
private CStatic _DuetIcon;
private CStatic _VideoIcon;
private CStatic _MedleyCalcIcon;
private CStatic _MedleyTagIcon;
private CTextureRef _CoverBigBGTexture;
private CTextureRef _CoverBGTexture;
private readonly CText _Artist;
private readonly CText _Title;
private readonly CText _SongLength;
private CText _Artist;
private CText _Title;
private CText _SongLength;
private int _NumW;
private int _NumH;