Merge remote-tracking branch 'upstream/master'
authorNghia Ho <nghiaho12@yahoo.com>
Mon, 9 Sep 2013 13:23:12 +0000 (23:23 +1000)
committerNghia Ho <nghiaho12@yahoo.com>
Mon, 9 Sep 2013 13:23:12 +0000 (23:23 +1000)
commit0e06465a23ee2ff467e01ff1528043e4b86bb4c6
tree759688e45ca7100831a70747ba55dcf017ac454c
parentcc15898353dc76ec81082cbac68a3c974fe8cd97
parent77a2529eb7cb355038359221745671ddc559de57
Merge remote-tracking branch 'upstream/master'
modules/imgproc/include/opencv2/imgproc.hpp