Merge branch '1.3-rel' (96293bfd) 65/21765/1
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Sun, 6 Aug 2017 14:07:46 +0000 (16:07 +0200)
committerPhilippe Coval <philippe.coval@osg.samsung.com>
Sun, 6 Aug 2017 14:07:54 +0000 (16:07 +0200)
Relate-to:
https://gerrit.iotivity.org/gerrit/21461
https://gerrit.iotivity.org/gerrit/21425
https://gerrit.iotivity.org/gerrit/21465
https://gerrit.iotivity.org/gerrit/21733

Change-Id: I96293bfdf8f06e9ddc3716ef1fecb5bde04e8d38
Bug: https://jira.iotivity.org/browse/IOT-2453
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
1  2 
resource/csdk/connectivity/src/bt_le_adapter/SConscript
resource/csdk/connectivity/src/nfc_adapter/SConscript
service/simulator/SConscript

Simple merge