Resolving conflicts after rebasing from public
authorunknown <girish.ravunnikutty@intel.com>
Thu, 10 Apr 2014 19:28:37 +0000 (12:28 -0700)
committerunknown <girish.ravunnikutty@intel.com>
Thu, 10 Apr 2014 19:28:37 +0000 (12:28 -0700)
commite032b5f5d5fdd714cac88db2973494bf08d9b12e
tree1bc7d01b1951caacd57b5056d99c3649b405b541
parentb59c517f98fd835297013d783c62da69aea2cffa
parentede6d4482b96b7dfe16bd394bc1ccd4d53cf20b5
Resolving conflicts after rebasing from public
modules/imgproc/src/smooth.cpp
modules/imgproc/test/ocl/test_filters.cpp