mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 13:47:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
6bbac2a7d9
opencv/modules/java/android_test
History
Roman Donchenko 95c2e8b51f Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	.gitignore
	doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
	modules/gpu/src/match_template.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_precomp.hpp
2013-09-10 11:30:19 +04:00
..
.settings Improving compatibility with the latest Android SDK (r21) and NDK (r8c). 2012-11-20 18:40:22 +04:00
res Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-09-10 11:30:19 +04:00
src/org/opencv/test Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
.classpath Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
.gitignore Normalized file endings. 2013-08-21 18:59:25 +04:00
.project Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
AndroidManifest.xml Delete a bunch more trailing whitespace that slipped through the cracks. 2013-09-04 16:13:27 +04:00
CMakeLists.txt copying '.classpath' and '.project' to build dir, useful for opening in eclipse 2013-04-05 08:50:08 +04:00