Matthias Bady d270c9e8b6 Type conversions to fix warnings		2014-01-18 11:12:13 +01:00
..
doc	merge with upstream	2014-01-05 19:00:25 +01:00
include/opencv2	Merge branch 'master' of https://github.com/Itseez/opencv into brief_cl	2014-01-18 10:38:07 +01:00
perf	Type conversions to fix warnings	2014-01-18 11:12:13 +01:00
src	merge with upstream	2014-01-05 19:00:25 +01:00
test	Type conversions to fix warnings	2014-01-18 11:12:13 +01:00
CMakeLists.txt	ocl: add support for initialization from user-provided OpenCL handles	2013-12-12 19:59:22 +04:00