Marina Kolpakova 680a44189c merged the trunk r8704:8716		2012-06-28 16:13:29 +00:00
..
src2	merged the trunk r8704:8716	2012-06-28 16:13:29 +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