Alexander Alekhin cb4267cb38 ts/perf: int -> enum WarmUpType		2013-12-03 12:40:31 +04:00
..
include/opencv2	ts/perf: int -> enum WarmUpType	2013-12-03 12:40:31 +04:00
misc	Merge pull request #1837 from asmorkalov:android_opencl	2013-11-25 12:19:20 +04:00
src	ts/perf: int -> enum WarmUpType	2013-12-03 12:40:31 +04:00
CMakeLists.txt	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-13 12:56:39 +04:00