Merge branch 'master' of git://code.opencv.org/opencv
authorbitwangyaoyao <bitwangyaoyao@gmail.com>
Mon, 24 Sep 2012 12:29:21 +0000 (20:29 +0800)
committerbitwangyaoyao <bitwangyaoyao@gmail.com>
Mon, 24 Sep 2012 12:29:21 +0000 (20:29 +0800)
commit3579c613884b452ace17a35330b7dfe10754d290
tree96b2890b8b40a095f412fe16d03cd6817e823900
parent09359982b1faed5c505b1282053dcaf26f213654
parentd09b3828b80ec406df1cf6a5b500052308e176f9
Merge branch 'master' of git://code.opencv.org/opencv