You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2016/04/26 21:55:30 UTC
[10/14] incubator-mynewt-core git commit: Merge branch 'develop'
Merge branch 'develop'
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/2bec33d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/2bec33d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/2bec33d4
Branch: refs/heads/develop
Commit: 2bec33d4dba12094f32ca560410b8671c0ce1d22
Parents: 62df74f 59a095b
Author: Christopher Collins <cc...@apache.org>
Authored: Fri Mar 18 18:02:04 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Fri Mar 18 18:02:04 2016 -0700
----------------------------------------------------------------------
apps/bletiny/src/cmd.c | 2 +-
apps/bletiny/src/main.c | 5 +-
hw/bsp/nrf51dk-16kbram/boot-nrf51dk-16kbram.ld | 2 +-
hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram.ld | 2 +-
.../nrf51dk-16kbram/nrf51dk-16kbram_download.sh | 2 +-
hw/bsp/nrf51dk-16kbram/src/os_bsp.c | 10 +-
hw/mcu/native/src/hal_gpio.c | 4 +-
libs/json/include/json/json.h | 6 +
libs/json/pkg.yml | 2 +
libs/json/src/test/test_json.c | 41 ++++
libs/json/src/test/test_json.h | 27 +++
libs/json/src/test/test_json_simple.c | 205 +++++++++++++++++++
libs/os/src/arch/sim/os_arch_sim.c | 2 -
libs/testutil/include/testutil/testutil.h | 4 +
.../controller/include/controller/ble_ll.h | 2 +-
net/nimble/host/src/ble_hs.c | 2 +-
16 files changed, 301 insertions(+), 17 deletions(-)
----------------------------------------------------------------------