projects / platform / core / context / context-service.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit72a76af9eb0c34907e60955b25dcf54c869c085b
tree459e121c6984ef94cbbb9c56ca2f28d4d95fae3atree | snapshot
parentc163e0a34d784e16c7a5683d2274f9152bb1df26commit | diff
parent63233db6bd6343139a86e21d88bb10a32773262dcommit | diff
Merge branch 'devel/tizen' into tizen

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