opencv/platforms/android
Roman Donchenko 9b7e77ccda Merge commit '83cdd43a' into merge-2.4
Conflicts:
	modules/core/include/opencv2/core/version.hpp
2013-12-30 16:36:35 +04:00
..
libinfo Switched OpenCV to a 3-component version number. 2013-11-15 19:41:53 +04:00
package Switched OpenCV to a 3-component version number. 2013-11-15 19:41:53 +04:00
service OpenCV version++; OpenCV Manager version++. 2013-12-23 12:35:06 +04:00
android.toolchain.cmake Applied feature #3375 and fix of pull 1842 to avoid merging problems later 2013-11-25 10:53:03 +01:00
java.rst android -> plarforms/android 2013-05-27 11:10:38 +04:00
README.android android -> plarforms/android 2013-05-27 11:10:38 +04:00
refman.rst Normalized file endings. 2013-08-21 18:59:25 +04:00

See http://opencv.org/android