Merge https://github.com/Itseez/opencv
authorNghia Ho <nghiaho12@yahoo.com>
Thu, 15 Aug 2013 11:51:36 +0000 (21:51 +1000)
committerNghia Ho <nghiaho12@yahoo.com>
Thu, 15 Aug 2013 11:51:36 +0000 (21:51 +1000)
commitd194bb614345967b3a1f425c63b31e2c7682923b
treed8a59b80e78b16b604743cd47218205e2e75a8a9
parent2c9c4188ae8f08cc1a47e6025659c357bed3c963
parent556028eff500192f2d81d11d90b394b1003ddfe4
Merge https://github.com/Itseez/opencv