Roman Donchenko 5ac3b8d5d8 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Pull requests:
	#904 from ograycode:2.4
	#905 from bitwangyaoyao:2.4_TVL1
	#902 from apavlenko:fix_run_py
	#882 from pengx17:2.4_rewrite_query_info

Conflicts:
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/pyrlk.cpp
	modules/ocl/src/tvl1flow.cpp

2013-05-27 16:58:04 +04:00

..

androidcamera

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

calib3d

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

contrib

Compile OpenCV with GCC visibility set to hidden

2013-05-13 18:33:20 +04:00

core

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

features2d

Added #include <limits> to files that were missing it.

2013-05-06 22:45:11 -04:00

flann

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

gpu

Fix a build error which manifests when building with CUDA < 5.

2013-05-23 14:00:13 +04:00

highgui

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

imgproc

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

java

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

2013-05-27 16:58:04 +04:00

legacy

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

ml

In CvBoost, delegated update_weights's implementation to a helper method.

2013-04-11 13:50:10 +04:00

nonfree

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

2013-05-27 16:58:04 +04:00

objdetect

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

ocl

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

2013-05-27 16:58:04 +04:00

photo

Revert "Merge pull request #836 from jet47:gpu-modules"

2013-04-18 15:03:50 +04:00

python

Merge pull request #881 from apavlenko:hidden_visibility

2013-05-13 22:08:45 +04:00

softcascade

Revert "Merge pull request #836 from jet47:gpu-modules"

2013-04-18 15:03:50 +04:00

stitching

Revert "Merge pull request #836 from jet47:gpu-modules"

2013-04-18 15:03:50 +04:00

superres

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

ts

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

2013-05-27 16:58:04 +04:00

video

Merge branch '2.4'

2013-04-17 12:07:17 +04:00

videostab

Changed visibility of the virtual functions in OnePassStabilizer and TwoPassStabilizer that are derived from StabilizerBase from private to protected to enable stabilizer implementations that are derived from OnePassStabilizer and TwoPassStabilier to properly overwrite these functions

2013-04-24 07:33:22 +02:00

world

Make core/internal.hpp a private header

2013-04-01 17:29:10 +04:00

CMakeLists.txt

Added compatibility headers

2013-03-13 17:26:56 +04:00

refman.rst.in

Made reference manual table of contents autogenerated

2012-05-30 14:06:47 +00:00