projects / platform / core / api / webapi-plugins.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c3f9aa 87e3fe5)
Merge branch 'tizen_3.0' into tizen_4.0 06/176306/2 submit/tizen_4.0/20180418.112525
authorPiotr Kosko <p.kosko@samsung.com>
Wed, 18 Apr 2018 08:49:16 +0000 (10:49 +0200)
committerPiotr Kosko <p.kosko@samsung.com>
Wed, 18 Apr 2018 08:49:16 +0000 (10:49 +0200)
Conflicts:
src/application/application_manager.cc
src/power/power.gyp

Change-Id: Ib9baaf8221cc99b01cfe8343b0e36a197c669941

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

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