Commit Graph

7 Commits

Author SHA1 Message Date
Marina Kolpakova
fb3d6ecb98 merged documentation and android service from trunk 2012-07-13 14:27:09 +00:00
Alexander Smorkalov
d943c35ef7 Touchscreen requirement turned off. 2012-07-03 13:31:15 +00:00
Alexander Smorkalov
73a798e718 About message updated.
Version updated.
2012-07-03 13:04:40 +00:00
Alexander Smorkalov
7294ccba3c Icon for OpenCV Manager updated. 2012-07-03 09:14: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