projects / platform / core / context / app-history.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 509b862 5ba11f0)
Merge branch 'devel/tizen' into tizen 95/133295/1 accepted/tizen/unified/20170609.204939 submit/tizen/20170609.130020
authorMu-Woong Lee <muwoong.lee@samsung.com>
Fri, 9 Jun 2017 12:54:11 +0000 (21:54 +0900)
committerMu-Woong Lee <muwoong.lee@samsung.com>
Fri, 9 Jun 2017 12:54:11 +0000 (21:54 +0900)
* devel/tizen:
  Dependency cleanup: apply the modified service & client interfaces
  Rename the class Json to avoid symbol conflicts with Jsoncpp

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

Trivial merge
Domain: Service Framework / Context; Licenses: Apache-2.0;