Andrey Pavlenko bd4d24f0fa Merge pull request #1122 from SpecLad:merge-2.4		2013-07-21 18:46:27 +04:00
..
doc	Super Resolution module	2013-02-27 13:41:15 +04:00
include/opencv2	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-07-16 11:52:41 +04:00
perf	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-07-16 11:52:41 +04:00
src	Merge pull request #1122 from SpecLad:merge-2.4	2013-07-21 18:46:27 +04:00
test	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-07-16 11:52:41 +04:00
CMakeLists.txt	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-07-16 11:52:41 +04:00