[mynewt-core] branch master updated (b859325 -> 3981383)

[we...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wes3 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git.


    from b859325  Merge pull request #995 from andrzej-kaczmarek/log-cbor-update
     add e387089  Fix build when charge_control is enabled
     new 3981383  Merge pull request #1071 from kasjer/charge-control-fix

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 hw/charge-control/include/charge-control/charge_control.h | 1 +
 hw/charge-control/syscfg.yml                              | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
wes3@apache.org.

[mynewt-core] 01/01: Merge pull request #1071 from kasjer/charge-control-fix

[we...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wes3 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git

commit 39813830672b7740e133e46ff85433424ae21ac9
Merge: b859325 e387089
Author: wes3 <wi...@runtime.io>
AuthorDate: Fri May 4 14:54:56 2018 -0700

    Merge pull request #1071 from kasjer/charge-control-fix
    
    Fix build when charge_control is enabled

 hw/charge-control/include/charge-control/charge_control.h | 1 +
 hw/charge-control/syscfg.yml                              | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
wes3@apache.org.