Files
libopenshot/include
Jonathan Thomas 1dfbb0e771 Merge branch 'develop' into clip-refactor-keyframes
# Conflicts:
#	src/CacheDisk.cpp
#	src/Clip.cpp
#	src/Frame.cpp
#	src/QtHtmlReader.cpp
#	src/QtImageReader.cpp
#	src/QtTextReader.cpp
#	src/effects/Bars.cpp
#	src/effects/Crop.cpp
2020-10-16 15:32:43 -05:00
..
2020-09-13 16:38:23 -04: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-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