From: Joseph Morrow <joseph.l.morrow@intel.com>
Date: Mon, 5 Oct 2015 17:34:32 +0000 (-0700)
Subject: Merge branch 'plugin-interface' into master
X-Git-Tag: 1.2.0+RC1~941^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=661a651dcd7cb67f980fde28a5901d42d15a00f7;p=platform%2Fupstream%2Fiotivity.git

Merge branch 'plugin-interface' into master

* plugin-interface:
  Enable ZigBee eventing in Plugin Interface through to IoTivity.
  Add event feature.
  Initial prototype for optimized Telegesis read/write layer.
  Fix logic in zigbee wrapper to correctly evaluate boolean values.

Conflicts:
	plugins/zigbee_wrapper/src/zigbee_wrapper.c

Change-Id: I23ea73432656197a8d79a169257ae5a57ac99718
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
---

661a651dcd7cb67f980fde28a5901d42d15a00f7