Roman Donchenko 3939d78336 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	modules/core/include/opencv2/core/types_c.h
	modules/gpu/src/cuda/imgproc.cu
	modules/gpu/src/cuda/safe_call.hpp
	modules/gpu/src/error.cpp
	modules/gpu/src/imgproc.cpp
	modules/imgproc/src/distransform.cpp
	modules/imgproc/src/shapedescr.cpp
	modules/python/src2/cv2.cpp
	modules/python/src2/cv2.cv.hpp

2013-07-22 18:38:57 +04:00

..

android_lib

Merge pull request #800 from asmorkalov:android_cam_idx_semantic

2013-04-29 10:00:08 +04:00

android_test

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-07-03 19:53:21 +04:00

generator

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-07-22 18:38:57 +04:00

test

Merge branch '2.4'

2013-03-29 19:38:35 +04:00

build.xml.in

Fix for encoding errors when building Java source

2013-03-27 17:43:00 +04:00

check-tests.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

CMakeLists.txt

fix for #3077

2013-06-14 20:25:23 +04:00