projects / platform / core / api / context.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa2a23f c4d6cf5)
Merge branch 'devel/tizen_3.0' into tizen 29/76329/1 accepted/tizen/common/20160627.191150 accepted/tizen/ivi/20160623.121118 accepted/tizen/mobile/20160623.121020 accepted/tizen/wearable/20160623.121102 submit/tizen/20160622.045445
authorMu-Woong Lee <muwoong.lee@samsung.com>
Thu, 23 Jun 2016 11:19:42 +0000 (20:19 +0900)
committerMu-Woong Lee <muwoong.lee@samsung.com>
Thu, 23 Jun 2016 11:19:42 +0000 (20:19 +0900)
* devel/tizen_3.0:
  Fix typo error
  Move APIs for custom event/condition to context_trigger.h (ACR-672) - Change subject of custom item related request

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

Trivial merge
Domain: Service Framework / Context;