3 Commits

Author	SHA1	Message	Date
Alexander Smorkalov	da31e12fed	CMake for OpenCV Manager updated; ... Some repo normalization problems fixed; Deprecated cmake keys removed; Warning fixed.	2012-10-31 11:47:27 +04:00
Marina Kolpakova	162f9fd7ea	merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811	2012-06-28 17:07:17 +00:00
Marina Kolpakova	01570fa800	merged Android Manager and new java layout	2012-06-28 16:23:19 +00:00