Merge branch 'devel/tizen_3.0' into tizen

* devel/tizen_3.0:
  sensord: modify proxi_change_state enum values
  sensord: sensor event listening thread support with GMainContext
  sensord: use macro in sensord package config
  Removing unused macros from check sensor API

Change-Id: I577dd682a4b98d73163ce23fb898ec70b583640b
Signed-off-by: kibak.yoon <kibak.yoon@samsung.com>

diff --cc packaging/sensord.spec
index 8bba933,8bba933..a0df20a
--- 1/packaging/sensord.spec
--- 2/packaging/sensord.spec
+++ b/packaging/sensord.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:       sensord
  Summary:    Sensor daemon
--Version:    1.0.0
++Version:    1.1.0
  Release:    0
  Group:        System/Sensor Framework
  License:    Apache-2.0