Andrey Kamaev 637397f621 Merge branch '2.4'

2013-02-20 12:31:16 +04:00

..

images

updating tutorial #1

2012-12-24 19:25:42 +04:00

android_dev_intro.rst

Avoid problem of old sphinx reporting an error on lines starting from :

2013-02-19 10:34:43 +04:00

dev_with_OCV_on_Android.rst

Merge branch '2.4'

2013-02-12 16:30:18 +04:00

O4A_SDK.rst

updating tutorial #2

2012-12-24 20:05:27 +04:00