Merge branch 'develop' of git://github.com/flokuep/Vocaluxe into Better_Graphics_Handling

Conflicts:
	Vocaluxe/COSFunctions.cs
	VocaluxeLib/CHelper.cs
	VocaluxeLib/Menu/CStatic.cs
	VocaluxeLib/Structs.cs
This commit is contained in:
Flamefire committed 2014-09-25 18:49:18 +02:00
commit c156fa69ab
550 files changed
+22434 -23687

No files matched your search

+3 -1
View File
@@ -43,7 +43,9 @@ namespace VocaluxeLib
{
Crop,
LetterBox,
Stretch
Stretch,
Zoom1,
Zoom2
}
public enum EGeneralAlignment