projects / platform / core / api / webapi-plugins.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: affe078 267bb30)
Merge branch 'tizen_3.0' into tizen_4.0 59/175059/1 accepted/tizen/4.0/unified/20180409.060420 submit/tizen_4.0/20180406.100414
authorPiotr Kosko <p.kosko@samsung.com>
Fri, 6 Apr 2018 09:04:22 +0000 (11:04 +0200)
committerPiotr Kosko <p.kosko@samsung.com>
Fri, 6 Apr 2018 09:04:22 +0000 (11:04 +0200)
Conflicts:
src/download/download_instance.cc
src/download/download_instance.h

Change-Id: Idd927480881807d231e7edf17319e092e8ded81c

1  2 
packaging/webapi-plugins.spec patch | diff1 | diff2 | blob | history
src/messaging/message.cc patch | diff1 | diff2 | blob | history

diff --cc packaging/webapi-plugins.spec
Simple merge
diff --cc src/messaging/message.cc
Simple merge
Domain: Web Framework / Web API;