fixed some merge errors

This commit is contained in:
Alexander Eckart committed 2013-05-10 19:36:58 +02:00
1 parent 4161652a1d
commit fd7b3ae3a3
3 files changed
+4 -7

No files matched your search

+1 -1
View File
@@ -579,7 +579,7 @@ namespace VocaluxeLib.Menu
break;
}
bounds = CBase.Fonts.GetTextBounds(this, h);
bounds = CBase.Fonts.GetTextBounds(this);
}
float x = X;