Merge branch 'develop' into std-prefixes

This commit is contained in:
FeRD (Frank Dana)
2019-08-17 16:07:24 -04:00
9 changed files with 42 additions and 36 deletions

View File

@@ -32,7 +32,7 @@
using namespace openshot;
// Initialize the values of the FileInfo struct
// Initialize the values of the EffectInfo struct
void EffectBase::InitEffectInfo()
{
// Init clip settings