Roman Donchenko 983e75e5de Merge remote-tracking branch 'origin/master' into merge-2.4		2014-08-01 15:01:41 +04:00
..
doc
include/opencv2	#2992: update after review	2014-07-30 00:03:41 +04:00
perf
src	Merge remote-tracking branch 'origin/master' into merge-2.4	2014-08-01 15:01:41 +04:00
test	Merge pull request #2992 from snikulov:upmerge_jpeg_tweak	2014-07-30 12:48:41 +00:00
CMakeLists.txt