Brenno a9274df96b Resolving conflicts

2020-10-20 01:04:59 -03:00

..

Cache_Tests.cpp

tests: Update include paths

2020-10-18 07:47:36 -04:00

Clip_Tests.cpp

tests: Update include paths

2020-10-18 07:47:36 -04:00

CMakeLists.txt

Merge branch 'clip-refactor-keyframes' into opencv

2020-10-19 22:29:48 -03:00

Color_Tests.cpp

tests: Update include paths

2020-10-18 07:47:36 -04:00

Coordinate_Tests.cpp

tests: Update include paths

2020-10-18 07:47:36 -04:00

CVObjectDetection_Tests.cpp

Resolving conflicts

2020-10-20 01:04:59 -03:00

CVStabilizer_Tests.cpp

Resolving conflicts

2020-10-20 01:04:59 -03:00

CVTracker_Tests.cpp

Resolving conflicts

2020-10-20 01:04:59 -03:00

DummyReader_Tests.cpp

tests: Update include paths

2020-10-18 07:47:36 -04:00

FFmpegReader_Tests.cpp

tests: Update include paths

2020-10-18 07:47:36 -04:00

FFmpegWriter_Tests.cpp

tests: Update include paths

2020-10-18 07:47:36 -04:00

Fraction_Tests.cpp

tests: Update include paths

2020-10-18 07:47:36 -04:00

Frame_Tests.cpp

Merge branch 'clip-refactor-keyframes' into opencv

2020-10-19 22:29:48 -03:00

FrameMapper_Tests.cpp

Merge branch 'develop' into clip-refactor-keyframes

2020-10-19 16:28:49 -04:00

ImageWriter_Tests.cpp

Merge branch 'develop' into new-header-move2

2020-10-19 15:12:28 -04:00

KeyFrame_Tests.cpp

tests: Update include paths

2020-10-18 07:47:36 -04:00

Point_Tests.cpp

tests: Update include paths

2020-10-18 07:47:36 -04:00

ReaderBase_Tests.cpp

tests: Update include paths

2020-10-18 07:47:36 -04:00

Settings_Tests.cpp

tests: Update include paths

2020-10-18 07:47:36 -04:00

tests.cpp

Update copyright range to current year

2019-06-11 06:48:32 -04:00

Timeline_Tests.cpp

tests: Update include paths

2020-10-18 07:47:36 -04:00