edgarriba a3e74ec521 Merge remote-tracking branch 'upstream/master' ... Conflicts: modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst		2014-08-05 12:59:47 +02:00
..
android	Add depends from highgui to imgcodecs and videoio. And include header from imgcodecs and videoio to imgcodecs	2014-07-21 15:10:41 +04:00
cpp	Merge remote-tracking branch 'upstream/master'	2014-08-05 12:59:47 +02:00
directx	Add depends from highgui to imgcodecs and videoio. And include header from imgcodecs and videoio to imgcodecs	2014-07-21 15:10:41 +04:00
gpu	Add depends from highgui to imgcodecs and videoio. And include header from imgcodecs and videoio to imgcodecs	2014-07-21 15:10:41 +04:00
java	Split highgui module to videoio and highgui	2014-07-14 23:16:47 +04:00
python2	removed contrib, legacy and softcsscade modules; removed latentsvm and datamatrix detector from objdetect. removed haartraining and sft apps.	2014-06-24 19:18:51 +04:00
tapi	Split highgui module to videoio and highgui	2014-07-14 23:16:47 +04:00
winrt	typos	2014-03-02 21:04:17 +04:00
CMakeLists.txt	removed contrib, legacy and softcsscade modules; removed latentsvm and datamatrix detector from objdetect. removed haartraining and sft apps.	2014-06-24 19:18:51 +04:00