review.tizen.org Git - profile/ivi/opencv.git/commit

projects / profile / ivi / opencv.git / commit

author	Marina Kolpakova <no@email>
	Thu, 28 Jun 2012 17:07:17 +0000 (17:07 +0000)
committer	Marina Kolpakova <no@email>
	Thu, 28 Jun 2012 17:07:17 +0000 (17:07 +0000)
commit	162f9fd7ead1b8941e24f856a9b4fed4fb68c9c3
tree	f428c2d0725bc70dabd49252e9443f3203519818	tree \| snapshot
parent	b156e2f7edd02aafb1eeac088f4965aef82df930	commit \| diff

merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811

61 files changed:

3rdparty/zlib/CMakeLists.txt		diff \| blob \| history
CMakeLists.txt		diff \| blob \| history
android/service/engine/CMakeLists.txt		diff \| blob \| history
cmake/OpenCVDetectAndroidSDK.cmake		diff \| blob \| history
cmake/OpenCVDetectPython.cmake		diff \| blob \| history
cmake/OpenCVFindLibsGrfmt.cmake		diff \| blob \| history
cmake/OpenCVFindXimea.cmake		diff \| blob \| history
doc/tutorials/introduction/android_binary_package/images/eclipse_opencv_dependency0.png	[new file with mode: 0644]	blob
doc/tutorials/introduction/android_binary_package/images/eclipse_opencv_dependency1.png	[new file with mode: 0644]	blob
modules/calib3d/src/calibration.cpp		diff \| blob \| history
modules/calib3d/test/test_cornerssubpix.cpp		diff \| blob \| history
modules/contrib/CMakeLists.txt		diff \| blob \| history
modules/contrib/src/chamfermatching.cpp		diff \| blob \| history
modules/contrib/src/rgbdodometry.cpp		diff \| blob \| history
modules/core/doc/dynamic_structures.rst		diff \| blob \| history
modules/core/doc/xml_yaml_persistence.rst		diff \| blob \| history
modules/core/src/matop.cpp		diff \| blob \| history
modules/core/src/system.cpp		diff \| blob \| history
modules/core/test/test_arithm.cpp		diff \| blob \| history
modules/core/test/test_io.cpp		diff \| blob \| history
modules/core/test/test_operations.cpp		diff \| blob \| history
modules/features2d/doc/feature_detection_and_description.rst		diff \| blob \| history
modules/features2d/include/opencv2/features2d/features2d.hpp		diff \| blob \| history
modules/features2d/test/test_fast.cpp		diff \| blob \| history
modules/features2d/test/test_mser.cpp		diff \| blob \| history
modules/features2d/test/test_nearestneighbors.cpp		diff \| blob \| history
modules/gpu/perf/perf_video.cpp		diff \| blob \| history
modules/gpu/src/hog.cpp		diff \| blob \| history
modules/highgui/CMakeLists.txt		diff \| blob \| history
modules/highgui/src/cap_ximea.cpp		diff \| blob \| history
modules/highgui/test/test_ffmpeg.cpp		diff \| blob \| history
modules/highgui/test/test_grfmt.cpp		diff \| blob \| history
modules/highgui/test/test_video_io.cpp		diff \| blob \| history
modules/highgui/test/test_video_pos.cpp		diff \| blob \| history
modules/imgproc/test/test_grabcut.cpp		diff \| blob \| history
modules/imgproc/test/test_watershed.cpp		diff \| blob \| history
modules/java/android_lib/.settings/org.eclipse.jdt.core.prefs	[new file with mode: 0644]	blob
modules/java/generator/gen_java.py		diff \| blob \| history
modules/legacy/CMakeLists.txt		diff \| blob \| history
modules/legacy/src/features2d.cpp		diff \| blob \| history
modules/legacy/src/image.cpp		diff \| blob \| history
modules/legacy/src/oneway.cpp		diff \| blob \| history
modules/legacy/test/test_em.cpp		diff \| blob \| history
modules/legacy/test/test_stereomatching.cpp		diff \| blob \| history
modules/ml/test/test_emknearestkmeans.cpp		diff \| blob \| history
modules/ml/test/test_precomp.hpp		diff \| blob \| history
modules/ml/test/test_save_load.cpp		diff \| blob \| history
modules/objdetect/CMakeLists.txt		diff \| blob \| history
modules/objdetect/test/test_latentsvmdetector.cpp		diff \| blob \| history
modules/photo/test/test_inpaint.cpp		diff \| blob \| history
modules/python/src2/gen.py		diff \| blob \| history
modules/ts/include/opencv2/ts/ts_gtest.h		diff \| blob \| history
modules/ts/misc/run.py		diff \| blob \| history
modules/ts/src/ts_gtest.cpp		diff \| blob \| history
modules/videostab/CMakeLists.txt		diff \| blob \| history
modules/videostab/src/frame_source.cpp		diff \| blob \| history
modules/videostab/src/precomp.hpp		diff \| blob \| history
samples/android/color-blob-detection/.settings/org.eclipse.jdt.core.prefs	[new file with mode: 0644]	blob
samples/python2/contours.py		diff \| blob \| history
samples/python2/edge.py		diff \| blob \| history
samples/python2/letter_recog.py		diff \| blob \| history

Domain: Multimedia / Uncategorized;

RSS Atom