Merge pull request #925 from pengx17:2.4_canny_tmp_fix
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 30 May 2013 08:01:08 +0000 (12:01 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 30 May 2013 08:01:09 +0000 (12:01 +0400)
commit678371be39d93aec07d675856cfd4b0a8488827c
tree5f6c63b2a1f0985a83c448442e4bb16edcb1fd1e
parentc176131a67c73917111a21c4533f1c0acf9c9d43
parentd015fa76fab95483ec7cdf0b44796c4caf70c31c
Merge pull request #925 from pengx17:2.4_canny_tmp_fix