Merge branch '1.3-rel' (907be8b7) 73/21273/1
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Thu, 6 Jul 2017 09:46:07 +0000 (11:46 +0200)
committerPhilippe Coval <philippe.coval@osg.samsung.com>
Thu, 6 Jul 2017 09:46:07 +0000 (11:46 +0200)
commite4b707590f832e52b8bca7e07f4a230c7a3238b6
tree770de1630191d93f9d4c02c1399163cd49c9e8f7
parent655b073b65f71cac09f2cdf1a6d77ff2db341cf1
parentf0cb3733ba7b1d7e1ed690f94be7cf84670007d5
Merge branch '1.3-rel' (907be8b7)

Related:
https://gerrit.iotivity.org/gerrit/21061

Conflicts:
  resource/src/SConscript

Bug: https://jira.iotivity.org/browse/IOT-2453
Change-Id: If0cb3733ba7b1d7e1ed690f94be7cf84670007d5
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
build_common/external_libs.scons
build_common/windows/SConscript
java/jni/SConscript
resource/src/SConscript