Merge remote-tracking branch 'upstream/master'
authorNghia Ho <nghiaho12@yahoo.com>
Thu, 19 Sep 2013 13:58:19 +0000 (23:58 +1000)
committerNghia Ho <nghiaho12@yahoo.com>
Thu, 19 Sep 2013 13:58:19 +0000 (23:58 +1000)
commit8e8ff4dd3382865ffec9f9e43bcbc3c8c4d4cbf8
treebafeebe1489e70e1642622dd4253bd1e30f7c02b
parent0e06465a23ee2ff467e01ff1528043e4b86bb4c6
parent0ecd7913f8a0623a64e84e926d4fc6bcaff80461
Merge remote-tracking branch 'upstream/master'
modules/imgproc/include/opencv2/imgproc.hpp