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

Resolving conflicts

Browse Source
This commit is contained in:
Brenno
2020-10-20 01:04:59 -03:00
parent 1626e1eeba
commit a9274df96b
30 changed files with 314 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/CVTracker.cpp
View File

@@ -28,7 +28,7 @@
* along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "../include/CVTracker.h"
#include "CVTracker.h"
// Constructor
CVTracker::CVTracker(std::string processInfoJson, ProcessingController &processingController)