You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ja...@apache.org on 2018/09/02 02:43:36 UTC

[cordova-ios] branch master updated (9d2ea13 -> ad96ef0)

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

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


    from 9d2ea13  GH#396: Update Objc-Test for Local & TravisCI (#397)
     add e2c885f  CB-14141: Don't duplicate resource files in xcodeproj
     new ad96ef0  Merge pull request #373 from dpogue/resouce-file-overwrite

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/templates/scripts/cordova/lib/prepare.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)


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


[cordova-ios] 01/01: Merge pull request #373 from dpogue/resouce-file-overwrite

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

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

commit ad96ef0f9e764b0f10b5cfd5c8b4e794bc0fd799
Merge: 9d2ea13 e2c885f
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Sun Sep 2 04:43:32 2018 +0200

    Merge pull request #373 from dpogue/resouce-file-overwrite
    
    CB-14141: Don't duplicate resource files in xcodeproj

 bin/templates/scripts/cordova/lib/prepare.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)



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