5 Commits

Author	SHA1	Message	Date
Andrey Kamaev	de153f0154	Fixed several opencv version references	2012-07-02 15:40:18 +00:00
Andrey Kamaev	35a31e1c35	Fixed few warnings	2012-06-28 18:11:54 +00:00
Marina Kolpakova	54ee92e3b0	merged trunk r8815:8827	2012-06-28 17:28:27 +00: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