projects / platform / core / context / context-common.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 193b049 c1ed46a)
Merge branch 'devel/tizen' into tizen 94/133294/1 accepted/tizen/unified/20170609.204938 submit/tizen/20170609.130020
authorMu-Woong Lee <muwoong.lee@samsung.com>
Fri, 9 Jun 2017 12:53:28 +0000 (21:53 +0900)
committerMu-Woong Lee <muwoong.lee@samsung.com>
Fri, 9 Jun 2017 12:53:28 +0000 (21:53 +0900)
* devel/tizen:
  Dependency cleanup: remove service & client base implementations
  Rename the class Json to avoid symbol conflicts with Jsoncpp

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

Trivial merge
Domain: Service Framework / Context;