Nghia Ho 0e06465a23 Merge remote-tracking branch 'upstream/master'

2013-09-09 23:23:12 +10:00

..

doc

Merged with HEAD and removed C interface to rotatedRectangleIntersection

2013-09-04 20:45:10 +10:00

include/opencv2

Merge remote-tracking branch 'upstream/master'

2013-09-09 23:23:12 +10:00

perf

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

src

Merge remote-tracking branch 'upstream/master'

2013-09-09 23:23:12 +10:00

test

Merge remote-tracking branch 'upstream/master'

2013-09-09 23:23:12 +10:00

CMakeLists.txt

Global CMake reorganization:

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