Merge pull request #1260 from SpecLad:no-cr-master

This commit is contained in:
Roman Donchenko 2013-08-13 16:00:20 +04:00 committed by OpenCV Buildbot
commit 99624628a9

File diff suppressed because one or more lines are too long