Andrey Kamaev c527340cb6 Merge branch 2.4		2013-02-04 17:15:55 +04:00
..
doc	Merge branch 2.4	2013-01-17 18:39:20 +04:00
include/opencv2/contrib	Update modules/contrib/include/opencv2/contrib/contrib.hpp	2013-02-01 21:13:55 +01:00
src	Merge branch 2.4	2013-02-04 17:15:55 +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