Merge pull request #376 from taka-no-me:solve_tiff_conflict
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 30 Jan 2013 15:36:09 +0000 (19:36 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 30 Jan 2013 15:36:09 +0000 (19:36 +0400)
commit33c26a93c6d97013b14e7dd080a347e242ef7f37
treeb6f73f4879235bac819ce4ab6b95cec14712b79b
parent4ceb8dd149c6737e13ae76e6be6eea31eb925af9
parent11871528cee96fc7133bfc3093903f4689abb0cc
Merge pull request #376 from taka-no-me:solve_tiff_conflict