Vadim Pisarevsky b63a7e66db Merge pull request #2953 from gongzg:master		2014-07-14 19:21:15 +00:00
..
doc	put the detection-based tracker back (to objdetect module), so that the Android face detection sample builds fine. The patch by Konstantin Matskevich that adds C++11 threads support has been merged in too. Also, fixed compile error in the doc builder.	2014-06-24 21:16:09 +04:00
include/opencv2	Avoid unmap an umat(ocl) which hasn't been mapped at all.	2014-07-09 16:21:20 +08:00
perf	added perf test for transpose inplace	2014-06-30 18:33:26 +04:00
src	Merge pull request #2953 from gongzg:master	2014-07-14 19:21:15 +00:00
test	optimized cv::norm with NORM_RELATIVE	2014-06-07 21:26:40 +04:00
CMakeLists.txt	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-02-25 15:02:24 +04:00