Andrey Kamaev f666bd221f Merged the trunk r8595:8668 (except iOS and new gpu functionality)		2012-06-15 13:21:26 +00:00
..
src2	Merged the trunk r8589:8653 - all changes related to build warnings	2012-06-15 13:04:17 +00:00
test	Refactored build conditionals in highgui tests	2012-04-18 21:32:56 +00:00
CMakeLists.txt	Merged the trunk r8595:8668 (except iOS and new gpu functionality)	2012-06-15 13:21:26 +00:00