generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
983e75e5de
opencv/samples/android/15-puzzle
History
Roman Donchenko a3bde36c84 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/calib3d/include/opencv2/calib3d/calib3d.hpp
	modules/contrib/doc/facerec/facerec_api.rst
	modules/contrib/include/opencv2/contrib/contrib.hpp
	modules/contrib/src/facerec.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/highgui/src/loadsave.cpp
	modules/imgproc/src/pyramids.cpp
	modules/ocl/include/opencv2/ocl/cl_runtime/cl_runtime.hpp
	modules/python/src2/gen.py
	modules/python/test/test.py
	modules/superres/test/test_superres.cpp
	samples/cpp/facerec_demo.cpp
2014-07-08 14:33:56 +04:00
..
.settings Improving compatibility with the latest Android SDK (r21) and NDK (r8c). 2012-11-20 18:40:22 +04:00
res Feature #2893 Create Java sample without layout.xml implemented. 2013-04-10 13:38:59 +04:00
src/org/opencv/samples/puzzle15 Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-07-08 14:33:56 +04:00
.classpath Code clean up. 2012-10-23 20:06:58 +04:00
.project Improving compatibility with the latest Android SDK (r21) and NDK (r8c). 2012-11-20 18:40:22 +04:00
AndroidManifest.xml Issue #2549 OpenCV Samples does not expand on full screen fixed. 2012-11-23 13:12:11 +04:00
CMakeLists.txt CMakeLists.txt rescued. Androidmanifest unified. 2012-10-23 20:06:58 +04:00