propagated some more changes from 2.3 to trunk

2011-06-23 12:15:35 +00:00
parent 6e613bca9b
commit f0624c08dc
116 changed files with 22049 additions and 192420 deletions
--- a/doc/opencv2/py/py_index.rst
+++ b/doc/opencv2/py/py_index.rst
@@ -0,0 +1,17 @@
+###############################
+OpenCV 2.x Python API Reference
+###############################
+
+.. highlight:: python
+
+.. toctree::
+    :maxdepth: 2
+
+    introduction
+    core
+    imgproc
+    features2d
+    objdetect
+    video
+    highgui
+    calib3d