Merge branch 'master' into otio

2020-10-22 20:26:16 +11:00
parent 0ec262125c 384650e85a
commit 917738d1de
149 changed files with 4350 additions and 2079 deletions
@@ -70,6 +70,7 @@
 OLIVE_NAMESPACE_ENTER

 Core* Core::instance_ = nullptr;
+const uint Core::kProjectVersion = 201003;

 Core::Core(const CoreParams& params) :
  main_window_(nullptr),