Andrey Kamaev 13b6a3a15e Merge branch 2.4		2012-12-24 17:10:07 +04:00
..
doc	Merge branch 2.4	2012-11-30 19:54:24 +04:00
include/opencv2/contrib	Merge branch 2.4	2012-11-20 19:12:00 +04:00
src	Merge branch 2.4	2012-12-24 17:10:07 +04:00
test	Fix OS X build warnings	2012-11-09 11:29:52 +04:00
CMakeLists.txt	Making all dependencies from highgui module optional	2012-06-26 07:29:36 +00:00