projects / platform / core / context / sensor-recorder.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitae8559a04f2a55954dd1c7160c9bf7ce938bd2a7
tree50783101a0ac604b23625a447c9471c279b8c167tree | snapshot
parent5e647a98f7e6111afc65e40a66590ad7b7b0994acommit | diff
parentd91f4a83e60ae3692b7e4a265fa6156369c58e62commit | diff
Merge branch 'devel/tizen' into tizen

* 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>
Domain: Service Framework / Context; Licenses: Apache-2.0;