projects
/
platform
/
core
/
api
/
camera.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
57dd374
036f74d
)
Merge branch 'tizen' into tizen_line_coverage
37/188537/1
author
Jeongmo Yang
<jm80.yang@samsung.com>
Thu, 30 Aug 2018 05:14:21 +0000
(14:14 +0900)
committer
Jeongmo Yang
<jm80.yang@samsung.com>
Thu, 6 Sep 2018 01:45:55 +0000
(10:45 +0900)
Change-Id: I31b991e2a89522fb95354e50602117cc06e61666
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
1
2
src/camera.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/camera.c
Simple merge