Merge branch 'devel/tizen_3.0' into tizen 32/61632/1
authorSomin Kim <somin926.kim@samsung.com>
Wed, 9 Mar 2016 08:51:29 +0000 (17:51 +0900)
committerSomin Kim <somin926.kim@samsung.com>
Wed, 9 Mar 2016 08:51:29 +0000 (17:51 +0900)
commitf7f82a65748d5c8351fa3a87ad538c50b2838dec
tree08455022ac4c034f176db945598e76a34f707178
parent10315b2e8e7f5e0bb307367ad56936b588206752
parent2cfeeeed9120711c0b1dab359e22602b904b1866
Merge branch 'devel/tizen_3.0' into tizen

* devel/tizen_3.0:
  Replace timer_manager & timer_util with TimerManager
  Remove GEO_LOCATION_PRECISION parameter from Json::set()
  Replace ctx::json with ctx:Json
  device: update cmake script to support common profile
  cmake: switch the dependencies variable to list, from space separated string
  Replace namespace ctx::shared with class ctx::SharedVars
  Create one unified so instead of one so for each provider
  Replace build dependency context-common with libcontext-shared & server
  Custom item recovery logic added when initialized (Uninstalled provider's item handling is still needed)
  Added custom provider
  Remove mutexing from device_status_alarm

Signed-off-by: Somin Kim <somin926.kim@samsung.com>
Conflicts:
src/device/CMakeLists.txt

Change-Id: I1105750bb9c0753defd1e6ce2b4d71d7acc86be8
src/device/CMakeLists.txt