Merge pull request #2301 from jet47:fix-nonfree-build
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 7 Feb 2014 11:34:45 +0000 (15:34 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 7 Feb 2014 11:34:46 +0000 (15:34 +0400)
commit5a8363a44edf9e86f2c2e8748ff0be1d3d41f0cb
tree51088f45db74ed3514d972d533311632f2d97dd7
parentd534d04f25dff03c1ad0a0e418c6549230c7b2ee
parent3e1f74f2cafc5c38d0e64928149edb87d9b28d28
Merge pull request #2301 from jet47:fix-nonfree-build