Roman Donchenko 684ff70308 Merge pull request #1864 from berak:mouse_and_match		2013-11-25 12:15:52 +04:00
..
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	Merge pull request #1824 from vpisarev:ocl_experiments5	2013-11-20 19:14:40 +04:00
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/ImageManipulations	Removed incorrect iCCP chunks from GUI resources.	2013-08-30 09:49:24 -04:00
CMakeLists.txt	cmake: revert CRT linkage option for MSVS	2013-10-09 17:49:11 +04:00