Roman Donchenko 5a9900481a Merge pull request #2105 from ilya-lavrenov:norm		2014-01-10 18:12:08 +04:00
..
doc	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-12-23 18:50:17 +04:00
include/opencv2	Merge pull request #2105 from ilya-lavrenov:norm	2014-01-10 18:12:08 +04:00
perf	Merge pull request #2105 from ilya-lavrenov:norm	2014-01-10 18:12:08 +04:00
src	Merge pull request #2105 from ilya-lavrenov:norm	2014-01-10 18:12:08 +04:00
test	fixed case with zero mask	2014-01-09 19:26:09 +04:00
CMakeLists.txt	Merge commit 'ee36717d' into merge-2.4	2013-12-30 16:49:39 +04:00