Merge branch 'master' of git://code.opencv.org/opencv
authorniko <newlife20080214@gmail.com>
Fri, 3 Aug 2012 06:09:04 +0000 (14:09 +0800)
committerniko <newlife20080214@gmail.com>
Fri, 3 Aug 2012 06:09:04 +0000 (14:09 +0800)
commit3180bbe3a84dcca2b665dd33db34baa3c9377496
tree836ec23f403498c1e32a4d1c66a2f0ca91adec8a
parent8eeacc8cc87c052bf10cfba915d2818eaefb48dc
parent27c2aa3a4ed54b4dfc391f441e0e071a9253e62d
Merge branch 'master' of git://code.opencv.org/opencv