projects / platform / core / context / context-service.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5101399 fea8869)
Merge branch 'devel/tizen_3.0' into tizen 58/87358/1 accepted/tizen/common/20160907.154910 accepted/tizen/ivi/20160908.044447 accepted/tizen/mobile/20160908.044357 accepted/tizen/wearable/20160908.044421 submit/tizen/20160907.123648
authorMu-Woong Lee <muwoong.lee@samsung.com>
Wed, 7 Sep 2016 12:24:32 +0000 (21:24 +0900)
committerMu-Woong Lee <muwoong.lee@samsung.com>
Wed, 7 Sep 2016 12:24:32 +0000 (21:24 +0900)
* devel/tizen_3.0:
  Version 0.9.6
  Subscribed to battery statistics logger
  Add 'PATH' environment variable to the upgrade script
  Upgrade script
  Use modified names of keys & types' definition
  Enable MyPlace detector

Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>
Conflicts:
scripts/context-service_upgrade.sh

Change-Id: I2e28d70cb0208c005d77aeced5c246e7b763aaf0


Trivial merge
Domain: Service Framework / Context;