projects
/
platform
/
core
/
api
/
webapi-plugins.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
087ebb8
e93a64e
)
Merge branch 'tizen_3.0' into tizen_4.0
95/190495/1
author
Piotr Kosko
<p.kosko@samsung.com>
Tue, 2 Oct 2018 12:11:27 +0000
(14:11 +0200)
committer
Piotr Kosko
<p.kosko@samsung.com>
Tue, 2 Oct 2018 12:11:27 +0000
(14:11 +0200)
Change-Id: Iaff2d9c208f5291dfac1eacb23070b8c4f3f10f2
1
2
packaging/webapi-plugins.spec
patch
|
diff1
|
diff2
|
blob
|
history
src/archive/zip_add_request.cc
patch
|
diff1
|
diff2
|
blob
|
history
src/exif/jpeg_file.cc
patch
|
diff1
|
diff2
|
blob
|
history
src/humanactivitymonitor/humanactivitymonitor_manager.cc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
packaging/webapi-plugins.spec
Simple merge
diff --cc
src/archive/zip_add_request.cc
Simple merge
diff --cc
src/exif/jpeg_file.cc
Simple merge
diff --cc
src/humanactivitymonitor/humanactivitymonitor_manager.cc
Simple merge