projects / platform / core / api / webapi-plugins.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c11833 0135eb3)
Merge branch 'tizen_4.0' into HEAD 67/177267/2
authorPiotr Kosko <p.kosko@samsung.com>
Fri, 27 Apr 2018 05:01:04 +0000 (07:01 +0200)
committerPiotr Kosko <p.kosko@samsung.com>
Fri, 27 Apr 2018 05:01:04 +0000 (07:01 +0200)
Conflicts:
src/power/power_manager.cc
src/power/power_manager.h

Change-Id: If92f51de4cae01ace304a007bddf63e23ac84d94

1  2 
packaging/webapi-plugins.spec patch | diff1 | diff2 | blob | history
src/contact/contact_util.cc patch | diff1 | diff2 | blob | history
src/content/content_manager.cc patch | diff1 | diff2 | blob | history

diff --cc packaging/webapi-plugins.spec
Simple merge
diff --cc src/contact/contact_util.cc
Simple merge
diff --cc src/content/content_manager.cc
Simple merge
Domain: Web Framework / Web API;