Merge branch 'devel/tizen_3.0' into tizen 33/61633/1
authorSomin Kim <somin926.kim@samsung.com>
Wed, 9 Mar 2016 08:54:42 +0000 (17:54 +0900)
committerSomin Kim <somin926.kim@samsung.com>
Wed, 9 Mar 2016 08:54:42 +0000 (17:54 +0900)
commit2f90dc746cfe625d61782f04ede58e9ab029b742
tree04fea656a4601e3695a273fd298c2b999def4ad9
parent85be4a306fcb6f268925e6e585c7e5828320cab4
parent200088cca43b94e2a41254d560e1d48d6db57276
Merge branch 'devel/tizen_3.0' into tizen

* devel/tizen_3.0:
  Added a space between literal and string based on C++11
  Add testcases for trigger time event/condition
  Replace ctx::json with ctx:Json
  Add DBusClient & IDBusClientListener
  Replace build dependency context-common with libcontext-shared
  Added API for custom items - add_custom_item(), remove_custom_item(), publish_custom_data() - context_trigger_enable_rule() will return NOT_SUPPORTED

Change-Id: I24223ce8bbe8fa590b9ab19fe6bd49f017cb6ac1
Signed-off-by: Somin Kim <somin926.kim@samsung.com>