You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by st...@apache.org on 2016/07/13 00:29:44 UTC

[2/2] incubator-mynewt-core git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-mynewt-core into develop

Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-mynewt-core into 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/5b6a0a72
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/5b6a0a72
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/5b6a0a72

Branch: refs/heads/develop
Commit: 5b6a0a725fefecc5d45d4e022ddb1f18a16c31ed
Parents: 885a749 350eb2a
Author: Sterling Hughes <st...@apache.org>
Authored: Tue Jul 12 17:29:36 2016 -0700
Committer: Sterling Hughes <st...@apache.org>
Committed: Tue Jul 12 17:29:36 2016 -0700

----------------------------------------------------------------------
 libs/os/src/arch/sim/os_arch_sim.c              |  2 +-
 libs/os/src/os.c                                |  1 +
 libs/os/src/os_priv.h                           |  5 ++++-
 libs/os/src/os_task.c                           |  3 ++-
 sys/mn_socket/include/mn_socket/mn_socket.h     | 13 +++++++++----
 sys/mn_socket/include/mn_socket/mn_socket_ops.h |  6 +++---
 6 files changed, 20 insertions(+), 10 deletions(-)
----------------------------------------------------------------------