Roman Donchenko 6133aeede8 Merge branch 'master' into merge-2.4 ...

Conflicts:
	doc/tutorials/definitions/tocDefinitions.rst

2013-10-01 17:37:05 +04:00

..

android

Updated the native activity sample to master's API.

2013-09-09 18:17:02 +04:00

c

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

2013-09-02 19:44:51 +04:00

cpp

Merge branch 'master' into merge-2.4

2013-10-01 17:37:05 +04:00

gpu

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +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

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

2013-09-10 11:30:19 +04:00

python2

Merge pull request #1429 from nzjrs:fix-sketcher

2013-09-30 18:06:56 +04:00

winrt/ImageManipulations

Removed incorrect iCCP chunks from GUI resources.

2013-08-30 09:49:24 -04:00

CMakeLists.txt

add an ocl sample

2012-08-08 17:12:53 +08:00