You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2016/04/14 03:36:59 UTC
[2/2] incubator-mynewt-core git commit: Merge remote-tracking branch
'vrahane/develop' into develop
Merge remote-tracking branch 'vrahane/develop' into develop
This closes #42.
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/226c23d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/226c23d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/226c23d1
Branch: refs/heads/develop
Commit: 226c23d1f06f443c731f9fe8cedab1abeb4a5169
Parents: a04dba6 4b19a7a
Author: Christopher Collins <cc...@apache.org>
Authored: Wed Apr 13 18:34:18 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Wed Apr 13 18:34:18 2016 -0700
----------------------------------------------------------------------
libs/baselibc/src/tinyprintf.c | 16 ++++++++--------
libs/json/src/json_encode.c | 8 ++++----
libs/os/include/os/os_time.h | 1 +
libs/os/src/os_time.c | 28 ++++++++++++++++++++++++----
sys/log/include/log/log.h | 10 +++++++---
sys/log/src/log.c | 36 +++++++++++++++++++++++++-----------
sys/log/src/log_cbmem.c | 25 ++++++++++++-------------
sys/log/src/log_nmgr.c | 29 +++++++++++++++++++++++++++--
8 files changed, 108 insertions(+), 45 deletions(-)
----------------------------------------------------------------------