merged documentation and android service from trunk

2012-07-13 14:27:09 +00:00
parent fbf1973bac
commit fb3d6ecb98
40 changed files with 463 additions and 265 deletions
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -234,6 +234,8 @@ latex_documents = [
   u'', 'manual'),
  ('doc/tutorials/tutorials', 'opencv_tutorials.tex', u'The OpenCV Tutorials',
   u'', 'manual'),
+  ('android/refman', 'opencv2manager.tex', u'The OpenCV Manager Manual',
+   u'', 'manual'),
 ]

 preamble ="""