You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2017/10/16 18:17:55 UTC

[cordova-browser] branch master updated (9826610 -> 9b83b05)

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

steven pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-browser.git.


    from 9826610  Merge pull request #45 from audreyso/CB-12895-eslint
     add 946e630  CB-13435: fix merges directory support for browser
     new 9b83b05  Merge pull request #46 from stevengill/CB-13435

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:
 bin/template/cordova/Api.js            |  2 +-
 bin/template/cordova/browser_parser.js | 39 +++++++++++++++++++++++-----------
 2 files changed, 28 insertions(+), 13 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@cordova.apache.org" <co...@cordova.apache.org>'].

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


[cordova-browser] 01/01: Merge pull request #46 from stevengill/CB-13435

Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

steven pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-browser.git

commit 9b83b0576303ab372d510326177f81c09515f876
Merge: 9826610 946e630
Author: Steve Gill <st...@gmail.com>
AuthorDate: Mon Oct 16 11:17:53 2017 -0700

    Merge pull request #46 from stevengill/CB-13435
    
    CB-13435: fix merges directory support for browser

 bin/template/cordova/Api.js            |  2 +-
 bin/template/cordova/browser_parser.js | 39 +++++++++++++++++++++++-----------
 2 files changed, 28 insertions(+), 13 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@cordova.apache.org" <co...@cordova.apache.org>.

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org