Merge branch 'master' of https://github.com/nghiaho12/opencv
authorNghia Ho <nghiaho12@yahoo.com>
Wed, 31 Jul 2013 14:03:39 +0000 (00:03 +1000)
committerNghia Ho <nghiaho12@yahoo.com>
Wed, 31 Jul 2013 14:03:39 +0000 (00:03 +1000)
commitd01e95f4b482cced8e27f8dc4bb06c054c6e5e71
tree2a20830c7be8a687884cf4226c999f169dd5565a
parentbc3dd2452f41900f03348486b83c4d917c8f3964
parentc0bbdde8bafef5c92a3b4a53571c7f29e90eb8c5
Merge branch 'master' of https://github.com/nghiaho12/opencv