Andrey Kamaev 9719ea93b6 Merge branch 2.4		2012-11-13 19:54:48 +04:00
..
doc
include/opencv2/highgui
perf	Fix OS X build warnings	2012-11-09 11:29:52 +04:00
src	Merge branch 2.4	2012-11-13 19:54:48 +04:00
test	Fix OS X build warnings	2012-11-09 11:29:52 +04:00
CMakeLists.txt