projects / platform / core / api / context.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2fe611b 6d53603)
Merge branch 'devel/tizen' into tizen 00/133300/1 accepted/tizen/unified/20170609.204941 submit/tizen/20170609.130020
authorMu-Woong Lee <muwoong.lee@samsung.com>
Fri, 9 Jun 2017 12:57:04 +0000 (21:57 +0900)
committerMu-Woong Lee <muwoong.lee@samsung.com>
Fri, 9 Jun 2017 12:57:04 +0000 (21:57 +0900)
* devel/tizen:
  Rename the class Json to avoid symbol conflicts with Jsoncpp

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

Trivial merge
Domain: Service Framework / Context;