projects / profile / ivi / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 82e2e6d 0566ab4)
Merge commit '0566ab4d3d' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 12:51:46 +0000 (16:51 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 12:51:46 +0000 (16:51 +0400)
Conflicts:
modules/core/src/system.cpp

1  2 
modules/core/src/system.cpp patch | diff1 | diff2 | blob | history
modules/ocl/src/gftt.cpp patch | diff1 | diff2 | blob | history

diff --cc modules/core/src/system.cpp
Simple merge
diff --cc modules/ocl/src/gftt.cpp
Simple merge
Domain: Multimedia / Uncategorized;