Vadim Pisarevsky ca183707f2 Merge pull request #3039 from alalek:ocv_world		2014-08-06 14:52:52 +00:00
..
doc	fixed building html docs	2014-08-03 02:34:47 +04:00
include/opencv2	Merge pull request #2879 from alalek:ocl_runtime_flags	2014-08-04 16:43:01 +00:00
perf	world fix	2014-08-05 20:12:35 +04:00
src	Merge pull request #3039 from alalek:ocv_world	2014-08-06 14:52:52 +00:00
test	world fix	2014-08-05 20:12:35 +04:00
CMakeLists.txt	world fix	2014-08-05 20:12:35 +04:00