Merge https://github.com/Itseez/opencv
authorNghia Ho <nghiaho12@yahoo.com>
Tue, 30 Jul 2013 13:58:10 +0000 (23:58 +1000)
committerNghia Ho <nghiaho12@yahoo.com>
Tue, 30 Jul 2013 13:58:10 +0000 (23:58 +1000)
commit3fcdbbe73441e165e1e8bbfc313df22a791ba9dd
tree5a3c486121934fd8ef99762753d1385f4d37df45
parentcb16f733b9a8ce7ccc7da479abe71a17db2e6fbf
parent93923141d50c2881233d6a315b96ba2a92883129
Merge https://github.com/Itseez/opencv
modules/imgproc/include/opencv2/imgproc.hpp