projects / platform / core / api / webapi-plugins.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d114249 146ddcf)
Merge branch 'tizen_3.0' into tizen_4.0 65/160665/1
authorPiotr Kosko <p.kosko@samsung.com>
Fri, 17 Nov 2017 10:28:43 +0000 (11:28 +0100)
committerPiotr Kosko <p.kosko@samsung.com>
Fri, 17 Nov 2017 10:28:43 +0000 (11:28 +0100)
Conflicts:
src/humanactivitymonitor/humanactivitymonitor_manager.cc

Change-Id: Iae74a00bd144f06f0bd6aed5ee881019c5a0bc1e

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

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