From: Somin Kim <somin926.kim@samsung.com>
Date: Wed, 9 Mar 2016 08:54:42 +0000 (+0900)
Subject: Merge branch 'devel/tizen_3.0' into tizen
X-Git-Tag: submit/tizen/20160314.020719~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F33%2F61633%2F1;p=platform%2Fcore%2Fapi%2Fcontext.git

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>
---

2f90dc746cfe625d61782f04ede58e9ab029b742