Vadim Pisarevsky 979f88f6db Merge pull request #5518 from Bovaz:master		2015-11-02 15:58:58 +00:00
..
doc	Merge pull request #4011 from cr333:parula	2015-05-16 19:11:32 +00:00
include/opencv2	Merge pull request #5386 from StevenPuttemans:add_markers	2015-11-02 15:45:38 +00:00
misc/java/test	Modified java wrapping mechanism	2015-03-02 18:12:30 +03:00
perf	Visual Studio 2015 warning and test fixes	2015-10-20 12:48:37 +03:00
src	Merge pull request #5518 from Bovaz:master	2015-11-02 15:58:58 +00:00
test	IPP_VERSION_X100 was changed to:	2015-09-25 17:50:15 +03:00
CMakeLists.txt	Python support	2015-03-02 18:13:00 +03:00