Fix merge conflicts
authorBaichuan Su <baichuan@multicorewareinc.com>
Thu, 7 Nov 2013 17:56:59 +0000 (09:56 -0800)
committerBaichuan Su <baichuan@multicorewareinc.com>
Thu, 7 Nov 2013 17:56:59 +0000 (09:56 -0800)
commit99a00d3dd968af97feebb3f3a9c8d8fd6821bb36
treeadbeca8eea913192fc8291b947276fd9b60a3666
parentbefcbf56fedf8011620657509a8966be33702a79
Fix merge conflicts
modules/ocl/test/test_imgproc.cpp