projects / platform / core / context / app-history.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit1f7a577020d9ad1ca91f3c1b827d110f3e47d5f5
treeb936b63d2d5f6450f4ec23fbc05f680ee80a4461tree | snapshot
parent509b862eeefd28734c495491037a27e72b9df70bcommit | diff
parent5ba11f0d606c16ab6a60c38c526c58422cf04a6dcommit | diff
Merge branch 'devel/tizen' into tizen

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