Merge pull request #2680 from adrians:remove_cv_err
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 19 May 2014 13:35:03 +0000 (17:35 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 19 May 2014 13:35:03 +0000 (17:35 +0400)

Trivial merge