5 Commits

Author	SHA1	Message	Date
Alexander Smorkalov	1ba250b69c	Message box text updated.	2012-07-03 13:03:38 +00:00
Alexander Smorkalov	65b53f96d0	OpenCV 2.4.0 constant version removed. All docs and samples updated for 2.4.2.	2012-07-03 07:58:48 +00:00
Andrey Kamaev	af912f4843	Merged the trunk r8901:8904	2012-07-02 13:46:47 +00:00
Andrey Kamaev	088a6597bc	Merged the trunk 8855,8885,8886	2012-07-02 12:05:06 +00:00
Marina Kolpakova	01570fa800	merged Android Manager and new java layout	2012-06-28 16:23:19 +00:00