Merge branch 'master' of git://code.opencv.org/opencv
authoryao <bitwangyaoyao@gmail.com>
Wed, 8 Aug 2012 09:13:30 +0000 (17:13 +0800)
committeryao <bitwangyaoyao@gmail.com>
Wed, 8 Aug 2012 09:13:30 +0000 (17:13 +0800)
commit0f4bdcd708fdf2526383ed8a45883a525fed71f6
tree1e90ccb8c15137aed6e9ab33a5814c697696e878
parent2fed1fcbff4c6981ce9400a46285080806599c30
parent37ca6d378bd8fa9245a54f6a25af704dc20c884f
Merge branch 'master' of git://code.opencv.org/opencv