projects / profile / ivi / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ceb8dd 1187152)
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)

Trivial merge
Domain: Multimedia / Uncategorized;