[opencv] 70/71: Merge pull request #7289 from alalek:android24
Nobuhiro Iwamatsu
iwamatsu at moszumanska.debian.org
Mon Oct 17 20:16:31 UTC 2016
This is an automated email from the git hooks/post-receive script.
iwamatsu pushed a commit to annotated tag 2.4.13.1
in repository opencv.
commit 14ac55d05e4bfc6256ffa245ebd2ba4681b6c3a4
Merge: 1f6cf50 2d10336
Author: Alexander Alekhin <alexander.a.alekhin at gmail.com>
Date: Fri Sep 16 15:55:39 2016 +0000
Merge pull request #7289 from alalek:android24
README.md | 6 +-
cmake/OpenCVDetectAndroidSDK.cmake | 12 +
cmake/OpenCVDetectPython.cmake | 7 +-
cmake/templates/OpenCV.mk.in | 4 +
doc/CMakeLists.txt | 4 +-
doc/conf.py | 2 +-
.../random_generator_and_text.rst | 2 +-
.../feature_detection/feature_detection.rst | 2 +-
.../feature_homography/feature_homography.rst | 2 +-
.../android_binary_package/O4A_SDK.rst | 6 +-
.../dev_with_OCV_on_Android.rst | 17 +-
modules/contrib/doc/facerec/index.rst | 4 -
.../generator/src/java/android+OpenCVLoader.java | 13 ++
platforms/android/build_sdk.py | 243 +++++++++++++++++++++
platforms/android/service/CMakeLists.txt | 2 -
platforms/android/service/doc/JavaHelper.rst | 8 +
platforms/android/service/readme.txt | 2 +
samples/android/face-detection/jni/Android.mk | 1 -
samples/cpp/Qt_sample/qt_opengl.cpp | 2 +-
19 files changed, 305 insertions(+), 34 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git
More information about the debian-science-commits
mailing list