Merge pull request #2337 from pmoulon:master
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 17 Feb 2014 08:24:48 +0000 (12:24 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 17 Feb 2014 08:24:48 +0000 (12:24 +0400)
commita0bb74a086d33a57509d147fccfdb3abd28b37dc
tree61d86b611d9808a564f545ba9adb211306c001df
parentcfcf07acfae100c98586baae563d375204a36154
parent8829e9f6c8efaf707275b4c42807f4b9865b59fc
Merge pull request #2337 from pmoulon:master