Merge pull request #2304 from mattvenn:master
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 13 Feb 2014 08:30:19 +0000 (12:30 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 13 Feb 2014 08:30:20 +0000 (12:30 +0400)
commitf297ec55ae077dd2bb0aee7ee9f12282ec3e3a0a
treebf221ee1becf5a5ab52da2719e17f2ead28cb549
parent935e36bc72e27f778aad2a5b633349926f2a6669
parent7acd28fbea28d370ae879bf75a0a12ecb47d7ff5
Merge pull request #2304 from mattvenn:master