Alexander Alekhin cc09f5a7de Merge pull request #7854 from alalek:backports_2016 ...

(2.4) Backports from master branch (#7854)

2016-12-15 18:09:44 +02:00

..

android

android: backport Android SDK build script

2016-09-16 16:15:51 +03:00

c

add fixed video

2016-04-19 15:30:49 +02:00

cpp

Merge pull request #7854 from alalek:backports_2016

2016-12-15 18:09:44 +02:00

gpu

Fix compilation problems with XCode 7.1.1 and cmake 3.3.2

2015-11-17 18:52:55 +03:00

java

add clojure sample

2013-12-11 13:26:47 +01:00

MacOSX/FaceTracker

Converted tabs to spaces.

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

ocl

Merge pull request #7854 from alalek:backports_2016

2016-12-15 18:09:44 +02:00

python

migration: github.com/opencv/opencv

2016-07-12 12:54:33 +03:00

python2

Added images necessary for tests

2016-02-26 12:42:35 +03:00

winrt

typos

2014-03-02 21:04:17 +04:00

CMakeLists.txt

Merge pull request #5514 from asmorkalov:as/nonfree-independent-samples

2015-10-15 10:56:23 +00:00