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_binary_package

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

2013-07-08 18:47:38 +04:00

crosscompilation

Tutorial for ARM Linux cross compilation added.

2013-02-20 12:48:30 +04:00

desktop_java

minor formatting

2013-03-06 12:59:38 +04:00

display_image

svn repository web references are replaced with links to git

2012-08-07 14:30:36 +04:00

how_to_write_a_tutorial

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

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

ios_install

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

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

linux_eclipse

Minimize usages of legacy C API inside the library

2013-04-16 12:00:02 +04:00

linux_gcc_cmake

Merge branch '2.4'

2013-02-01 14:59:40 +04:00

linux_install

Normalize whitespace in documentation and text files

2012-10-17 21:42:09 +04:00

load_save_image

Minimize usages of legacy C API inside the library

2013-04-16 12:00:02 +04:00

table_of_content_introduction

added tutorial by Wolf Kienzle on using "image watch" plugin for ms visual studio

2013-03-24 23:48:35 +04:00

windows_install

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

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

windows_visual_studio_image_watch

Merge branch '2.4'

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

windows_visual_studio_Opencv

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

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