openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'clip-refactor-keyframes' into caption-effect

Browse Source 
# Conflicts:
#	src/effects/Caption.h
This commit is contained in:
Jonathan Thomas
2020-10-20 13:18:12 -05:00
parent 80a1fe8ca4 e5d5d82050
commit eb2e787537
196 changed files with 1459 additions and 1175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/EffectInfo.cpp
View File

@@ -28,8 +28,7 @@
* along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "../include/EffectInfo.h"
#include "EffectInfo.h"
using namespace openshot;