Marina Kolpakova 162f9fd7ea merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811		2012-06-28 17:07:17 +00:00
..
src2	merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811	2012-06-28 17:07: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