projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3cd5073
7b366df
)
Merge remote-tracking branch 'upstream/master'
author
Tony
<exocoder@gmail.com>
Thu, 10 Apr 2014 07:07:02 +0000
(08:07 +0100)
committer
Tony
<exocoder@gmail.com>
Thu, 10 Apr 2014 07:07:02 +0000
(08:07 +0100)
Conflicts:
CMakeLists.txt
Trivial merge
projects / profile / ivi / opencv.git / commitdiff