projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3498432
f104d5b
)
Merge remote-tracking branch 'upstream/master'
author
Tony
<exocoder@gmail.com>
Sun, 13 Apr 2014 09:39:32 +0000
(10:39 +0100)
committer
Tony
<exocoder@gmail.com>
Sun, 13 Apr 2014 09:39:32 +0000
(10:39 +0100)
Rebase to lates upstream
1
2
cmake/OpenCVFindLibsGUI.cmake
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
cmake/OpenCVFindLibsGUI.cmake
Simple merge