projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
659c534
092f916
)
Merge pull request #2146 from SpecLad:merge-2.4
author
Roman Donchenko
<roman.donchenko@itseez.com>
Fri, 17 Jan 2014 12:28:29 +0000
(16:28 +0400)
committer
OpenCV Buildbot
<buildbot@opencv.org>
Fri, 17 Jan 2014 12:28:30 +0000
(16:28 +0400)
1
2
modules/core/include/opencv2/core/mat.inl.hpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/highgui/src/window_w32.cpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/ts/include/opencv2/ts/ts_perf.hpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
modules/core/include/opencv2/core/mat.inl.hpp
Simple merge
diff --cc
modules/highgui/src/window_w32.cpp
Simple merge
diff --cc
modules/ts/include/opencv2/ts/ts_perf.hpp
Simple merge
projects / profile / ivi / opencv.git / commitdiff