Merge branch 2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 11 Jan 2013 11:43:50 +0000 (15:43 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 11 Jan 2013 11:45:23 +0000 (15:45 +0400)
commit084b1c796900b0825fc4e0593ab3143da3f3a90e
treef9e3f2fef53ec6ebc1311e618427cb5e2ac09cb6
parent19229f2fa0914245c4e20e66ed3b04cd6f5f0c3a
parent5e2726fb17043f4e4b7aa15068b26cc8a4fc00bf
Merge branch 2.4
doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst