merge of various commits

This commit is contained in:
itsmattkc
2019-02-19 02:41:01 -08:00
7 changed files with 3306 additions and 3285 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
/***
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team