6 Commits

Author	SHA1	Message	Date
Brenno	e48405da9b	Merge remote-tracking branch 'origin/develop' into keyframe-refactor	2020-12-17 22:36:41 -03:00
Jonathan Thomas	ac73bd965d	Fixing an issue caused by timeline::GetClip returning a ClipBase instead of a Clip (broke waveform generation). ... Also adding a swig definition for the Caption effect.	2020-12-03 10:52:27 -06:00
Brenno	1626e1eeba	Merge branch 'clip-refactor-keyframes' into opencv	2020-10-19 22:29:48 -03:00
FeRD (Frank Dana)	a1e44edad4	Merge branch 'develop' into clip-refactor-keyframes	2020-10-19 16:28:49 -04:00
FeRD (Frank Dana)	600f559460	Bindings: Rename MappedMetadata to MetadataMap	2020-10-18 07:47:36 -04:00
FeRD (Frank Dana)	a6441d822d	Reorganize source tree (headers in src/) ... - src/bindings/ moves to /bindings/ - src/examples/ moves to /examples/ - Contents of include/ merged into src/ with same hierarchy - src/Qt/demo/ moves to examples/qt-demo/	2020-10-18 05:05:29 -04:00