Merge branch 'master' of git://code.opencv.org/opencv
authoryao <bitwangyaoyao@gmail.com>
Fri, 3 Aug 2012 07:44:15 +0000 (15:44 +0800)
committeryao <bitwangyaoyao@gmail.com>
Fri, 3 Aug 2012 07:44:15 +0000 (15:44 +0800)
commit687d7639a8c4e828825f0c75f990055322ace6b0
tree7fe16924439ae9b6e961e6dad4597fd89ff467a2
parent1eedcea58d95a8a7485e34a3ee470dadb338877a
parent3180bbe3a84dcca2b665dd33db34baa3c9377496
Merge branch 'master' of git://code.opencv.org/opencv