Roman Donchenko 983e75e5de Merge remote-tracking branch 'origin/master' into merge-2.4

2014-08-01 15:01:41 +04:00

..

android

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

2014-08-01 15:01:41 +04:00

cpp

Merge pull request #2608 from Siddharthk:master

2014-08-01 09:13:32 +00: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