Merge pull request #1155 from bitwangyaoyao:master_fix
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Sun, 21 Jul 2013 14:50:38 +0000 (18:50 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Sun, 21 Jul 2013 14:50:39 +0000 (18:50 +0400)
commitaaf47578e8e5b41c7ed71fc09308525dda787ab3
treefe45ba13ec2dbfc7a5a85689cd2f213d27422b0a
parentbd4d24f0fa79c2d57bfcc50e7f2e845b5d2e8e27
parent18f71fd410b674f5e0ccaa53fb1901e4817bd2ef
Merge pull request #1155 from bitwangyaoyao:master_fix