Merge branch 'develop' into rap
This commit is contained in:
commit
612c18326d
46 files changed
+1632
-319
No files matched your search
@@ -64,8 +64,10 @@ namespace VocaluxeLib
|
||||
#region Fonts
|
||||
public enum EAspect
|
||||
{
|
||||
Automatic,
|
||||
Crop,
|
||||
LetterBox,
|
||||
PillarBox,
|
||||
Stretch,
|
||||
Zoom1,
|
||||
Zoom2
|
||||
@@ -438,4 +440,4 @@ namespace VocaluxeLib
|
||||
TR_USERROLE_PROFILEEDITOR = 32
|
||||
// ReSharper restore InconsistentNaming
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user