edgarriba 7e2bb63378 Merge branch 'master' of https://github.com/Itseez/opencv		2014-08-18 22:30:00 +02:00
..
calib3d	fixed white space	2014-08-09 21:08:46 +02:00
core	Extract imgcodecs module from highgui	2014-07-07 16:28:08 +04:00
definitions	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-12-16 15:02:12 +04:00
features2d	moved nonfree and a part of features2d to opencv_contrib/xfeatures2d	2014-08-11 23:26:39 +04:00
general/table_of_content_general	Normalized file endings.	2013-08-21 18:59:25 +04:00
gpu	Deleted all trailing whitespace.	2013-08-21 18:59:24 +04:00
highgui	Merge with master and fix conflicts	2014-08-13 18:24:11 +04:00
images	Merge pull request #1474 from f-morozov:for_pr	2013-10-02 11:49:54 +04:00
imgproc	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-24 19:02:16 +04:00
introduction	fixing more compile problems with Java bindings etc	2014-08-14 13:48:52 +04:00
ios	Split highgui module to videoio and highgui	2014-07-14 23:16:47 +04:00
ml	Extract imgcodecs module from highgui	2014-07-07 16:28:08 +04:00
objdetect	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-12-03 17:35:21 +04:00
photo	Docs updated, added InputArray, fixes for makePtr,...	2013-09-26 19:02:35 +04:00
video	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-04-07 14:59:34 +04:00
viz	implemented showImage	2014-01-19 18:38:55 +04:00
tutorials.rst	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-04-07 14:59:34 +04:00