Vadim Pisarevsky 19229f2fa0 Merge pull request #253 from Nerei:smart_operators_for_smart_ptr

2013-01-10 20:35:22 +04:00

..

androidcamera

Fix build with STLPort from NDK r8d

2012-12-22 00:59:56 +04:00

calib3d

Merge pull request #266 from prclibo:master

2012-12-28 12:51:34 +04:00

contrib

Merge branch 2.4

2012-12-24 17:10:07 +04:00

core

Merge pull request #253 from Nerei:smart_operators_for_smart_ptr

2013-01-10 20:35:22 +04:00

features2d

Smart operators for smart Ptr (feature #2637)

2013-01-07 22:33:12 +04:00

flann

Merge branch '2.4'

2012-10-23 20:32:19 +04:00

gpu

fix precompiled headers usage in gpu module

2012-12-30 16:58:41 +04:00

highgui

Merge branch 'master' into cuda-dev

2012-12-24 13:48:33 +04:00

imgproc

Merge pull request #135 from nevion:master

2013-01-10 16:43:45 +04:00

java

Merge release 2.4.3.2

2012-12-25 19:07:08 +04:00

legacy

Merge branch 2.4

2012-11-13 19:54:48 +04:00

ml

Merge branch 2.4

2012-12-21 17:58:48 +04:00

nonfree

Merge branch 2.4

2012-12-14 14:46:41 +04:00

objdetect

fix precompiled headers usage in gpu module

2012-12-30 16:58:41 +04:00

ocl

fix the compilation bug of main.cpp in perf test and accuracy test on ocl module. It caused by the incompatibility of command line parser class in core.hpp between master branch and 2.4 branch.

2012-11-07 13:49:09 +08:00

photo

Merge branch 2.4

2012-11-30 19:54:24 +04:00

python

Merge branch 'master' of https://github.com/nevion/opencv into cc

2012-12-15 21:45:55 +04:00

stitching

Merge branch 2.4

2012-12-24 17:10:07 +04:00

ts

merge CUDA dev branch

2012-12-29 19:44:38 +04:00

video

Increase max RMSE error for tvl1 optical flow test

2012-12-21 14:18:07 +04:00

videostab

Merge branch 2.4

2012-12-24 17:10:07 +04:00

world

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

CMakeLists.txt

Global CMake reorganization:

2012-02-03 11:26:49 +00:00

refman.rst.in

Made reference manual table of contents autogenerated

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