Files
libopenshot/include
Jonathan Thomas fb879a4e46 Merge branch 'develop' into clip-refactor-keyframes
# Conflicts:
#	include/Clip.h
#	include/ReaderBase.h
#	include/Timeline.h
#	src/Clip.cpp
#	src/FFmpegReader.cpp
#	src/QtImageReader.cpp
#	src/ReaderBase.cpp
2020-10-05 23:14:44 -05:00
..
2019-12-18 23:55:16 -05:00
2019-12-27 08:51:51 -05:00
2020-08-20 14:53:16 -04:00
2019-12-27 08:51:51 -05:00
2019-12-27 08:51:51 -05:00
2019-12-27 08:51:51 -05:00
2019-08-04 23:14:38 -04:00
2019-08-04 23:14:38 -04:00
2019-12-27 08:51:51 -05:00
2019-08-04 23:14:38 -04:00
2019-12-27 08:51:51 -05:00
2019-06-11 06:48:32 -04:00
2020-08-06 21:31:21 -04:00
2019-12-18 23:55:16 -05:00
2020-08-06 21:31:21 -04:00
2019-12-27 08:51:51 -05:00
2020-08-06 21:31:21 -04:00
2019-12-27 08:51:51 -05:00
2020-08-20 15:26:53 -04:00
2019-12-27 08:51:51 -05:00