projects / platform / core / context / context-service.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c163e0a 63233db)
Merge branch 'devel/tizen' into tizen 99/133299/1 accepted/tizen/unified/20170609.204946 submit/tizen/20170609.130020
authorMu-Woong Lee <muwoong.lee@samsung.com>
Fri, 9 Jun 2017 12:56:38 +0000 (21:56 +0900)
committerMu-Woong Lee <muwoong.lee@samsung.com>
Fri, 9 Jun 2017 12:56:38 +0000 (21:56 +0900)
* devel/tizen:
  Dependency cleanup: add service & client manipulation classes
  Rename the class Json to avoid symbol conflicts with Jsoncpp

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

Trivial merge
Domain: Service Framework / Context;