Merge branch 'visual-debug'

author Michal Sojka <michal.sojka@cvut.cz>

Thu, 27 Sep 2018 21:22:16 +0000 (23:22 +0200)

committer Michal Sojka <michal.sojka@cvut.cz>

Thu, 27 Sep 2018 21:22:16 +0000 (23:22 +0200)
author Michal Sojka <michal.sojka@cvut.cz>
Thu, 27 Sep 2018 21:22:16 +0000 (23:22 +0200)
committer Michal Sojka <michal.sojka@cvut.cz>
Thu, 27 Sep 2018 21:22:16 +0000 (23:22 +0200)
diff --cc main_vot.cpp
Simple merge
diff --cc src/kcf.cpp
Simple merge
diff --cc src/kcf.h
Simple merge
author	Michal Sojka <michal.sojka@cvut.cz>
	Thu, 27 Sep 2018 21:22:16 +0000 (23:22 +0200)
committer	Michal Sojka <michal.sojka@cvut.cz>
	Thu, 27 Sep 2018 21:22:16 +0000 (23:22 +0200)
		1	2
main_vot.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/kcf.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/kcf.h	patch \|	diff1 \|	diff2 \|	blob \| history