Merge pull request #111 from taka-no-me/algorithm/addParam-short
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 31 Oct 2012 12:57:06 +0000 (16:57 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 31 Oct 2012 12:57:06 +0000 (16:57 +0400)
1  2 
modules/imgproc/perf/perf_warp.cpp

Simple merge