Merge branch 'devel/tizen' into tizen 06/137206/1 accepted/tizen/unified/20170705.162922 submit/tizen/20170705.022841
authorMu-Woong Lee <muwoong.lee@samsung.com>
Wed, 5 Jul 2017 01:52:02 +0000 (10:52 +0900)
committerMu-Woong Lee <muwoong.lee@samsung.com>
Wed, 5 Jul 2017 01:52:02 +0000 (10:52 +0900)
commitac35f10018a3049e84718664b11aa5eef0b799e4
tree7e109b995c6842836633ad1a33aaa01c416d444a
parent5d8da45ddd9af99a3926d05fee80812f3b0df5f2
parent61da57e6c5ea97e9ea7a038ea2b810aeba940770
Merge branch 'devel/tizen' into tizen

* devel/tizen:
  Replace the glib-json wrapper CtxJson with jsoncpp

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