projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fc37df0 1d25e5f)
Merge branch 'matlab' into matlab_public
authorhbristow <hilton.bristow@gmail.com>
Mon, 2 Sep 2013 04:23:11 +0000 (14:23 +1000)
committerhbristow <hilton.bristow@gmail.com>
Mon, 2 Sep 2013 04:23:11 +0000 (14:23 +1000)
Conflicts:
CMakeLists.txt
README.md
  samples/

1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history

diff --cc CMakeLists.txt
Simple merge
Domain: Multimedia / Media Vision;