Fixed merge conflicts
authorElena Gvozdeva <elena.gvozdeva@itseez.com>
Thu, 23 Jan 2014 11:31:32 +0000 (15:31 +0400)
committerElena Gvozdeva <elena.gvozdeva@itseez.com>
Thu, 23 Jan 2014 11:31:32 +0000 (15:31 +0400)
commit4d86804f1120e655031a372d14f754ab756f45b5
tree37d11d5ea0d9475f74182edc776cd13cac594e8d
parent7bd8f9294d9d28895456b13f31d116f13c7651b7
Fixed merge conflicts
modules/imgproc/test/ocl/test_match_template.cpp