projects / platform / core / context / sensor-recorder.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5e647a9 d91f4a8)
Merge branch 'devel/tizen' into tizen 98/133298/1 accepted/tizen/unified/20170609.204936 submit/tizen/20170609.130020
authorMu-Woong Lee <muwoong.lee@samsung.com>
Fri, 9 Jun 2017 12:56:00 +0000 (21:56 +0900)
committerMu-Woong Lee <muwoong.lee@samsung.com>
Fri, 9 Jun 2017 12:56:00 +0000 (21:56 +0900)
* devel/tizen:
  Dependency cleanup: apply the modified service & client interfaces
  Rename the class Json to avoid symbol conflicts with Jsoncpp
  Add dependency to sensord

Change-Id: I506d003cf50ad461db29b9acee274d00c67fe1f2
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>

Trivial merge
Domain: Service Framework / Context; Licenses: Apache-2.0;