Merge pull request #810 from pengx17:master_fix_ocl_tmflag
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Sat, 13 Apr 2013 12:33:53 +0000 (16:33 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Sat, 13 Apr 2013 12:33:53 +0000 (16:33 +0400)
1  2 
modules/ocl/src/match_template.cpp

Simple merge