Merge branch 'release-0.3' into develop

Conflicts:
	VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
This commit is contained in:
Flamefire committed 2013-10-19 02:12:29 +02:00
commit dbcd79af79
5 files changed
+65 -101

No files matched your search

+1 -6
View File
@@ -47,7 +47,7 @@ namespace VocaluxeLib.Menu.SongMenu
public SRectF Rect
{
get { return _SongMenu.GetRect(); }
get { return _SongMenu.Rect; }
}
#region ISongMenu
@@ -156,11 +156,6 @@ namespace VocaluxeLib.Menu.SongMenu
_SongMenu.SetVisible(visible);
}
public SRectF GetRect()
{
return _SongMenu.GetRect();
}
public bool IsSmallView()
{
return _SongMenu.IsSmallView();