projects / platform / core / context / context-common.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3a7f1b4 f1039d8)
Merge branch 'devel/tizen' into tizen 03/137203/1 accepted/tizen/unified/20170705.162912 submit/tizen/20170705.022841
authorMu-Woong Lee <muwoong.lee@samsung.com>
Wed, 5 Jul 2017 01:49:49 +0000 (10:49 +0900)
committerMu-Woong Lee <muwoong.lee@samsung.com>
Wed, 5 Jul 2017 01:49:49 +0000 (10:49 +0900)
* devel/tizen:
  Add conditional exception-throwing macros for error handling
  Remove json-glib from the spec & cmake scripts
  Remove the glib-json wrapper CtxJson

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

Trivial merge
Domain: Service Framework / Context;