Roman Donchenko 90c28d254f Merge pull request #1961 from SpecLad:merge-2.4		2013-12-10 14:39:35 +04:00
..
doc	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-12-03 17:35:21 +04:00
include/opencv2	updated patch to bring in the first functions with "transparent API"	2013-11-18 11:48:00 -05:00
perf	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
src	Merge pull request #1961 from SpecLad:merge-2.4	2013-12-10 14:39:35 +04:00
test	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-11-19 16:21:09 +04:00
CMakeLists.txt	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-11-26 15:05:26 +04:00