siddharth 33e6c07485 Removed build errors and removed test images ...

Removed conflict

Error fix 1

Error fix 2

Error fix 3

Error fix 3

Error fix 4

Error fix 5

Error fix 6

Error fix 7

Error fix 8

Error fix 9

Error fix 10

Error fix 11

Error fix 12

Errors fixed

Removed opencv_extra folder inside opencv folder

2013-12-04 19:18:00 +05:30

..

android

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

2013-10-15 20:08:52 +04:00

c

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

2013-10-15 20:08:52 +04:00

cpp

Removed build errors and removed test images

2013-12-04 19:18:00 +05:30

gpu

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

2013-11-05 16:38:23 +04:00

java

Normalized file endings.

2013-08-21 18:59:25 +04:00

MacOSX/FaceTracker

Converted tabs to spaces.

2013-08-21 18:59:26 +04:00

ocl

another attempt to fix compile errors

2013-11-18 22:15:04 -05:00

python2

mouse_and_match.py missing import cv2

2013-11-24 15:58:13 +01:00

winrt

Filter selection and several filters implemented for WinRT sample.

2013-11-29 09:47:25 +04:00

CMakeLists.txt

cmake: revert CRT linkage option for MSVS

2013-10-09 17:49:11 +04:00