alexandre benoit 9549949228 minor chnges for conflict removal		2013-04-29 15:12:44 +02:00
..
doc	minor chnges for conflict removal	2013-04-29 15:12:44 +02:00
include/opencv2/contrib	minor chnges for conflict removal	2013-04-29 15:12:44 +02:00
src	minor chnges for conflict removal	2013-04-29 15:12:44 +02:00
test	quiet most of the OSX build warnings	2012-07-05 12:56:31 +00:00
CMakeLists.txt	Making all dependencies from highgui module optional	2012-06-26 07:29:36 +00:00