Roman Donchenko beada19ad0 Merge pull request #1297 from SpecLad:merge-2.4		2013-08-20 14:10:22 +04:00
..
doc	Super Resolution module	2013-02-27 13:41:15 +04:00
include/opencv2	Merge remote-tracking branch 'origin/2.4'	2013-08-06 13:56:49 +04:00
perf	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-19 19:02:36 +04:00
src	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-19 19:02:36 +04:00
test	Merge pull request #1297 from SpecLad:merge-2.4	2013-08-20 14:10:22 +04:00
CMakeLists.txt	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-07-16 11:52:41 +04:00