]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - opencv/tiopencv.git/commitdiff
projects / opencv / tiopencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce7a2f7 b94963d)
Merge commit 'b94963d38' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 12:39:51 +0000 (16:39 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 12:39:51 +0000 (16:39 +0400)
Conflicts:
cmake/OpenCVGenAndroidMK.cmake


Trivial merge
TI Specific Patches on OpenCV.