You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ju...@apache.org on 2018/09/12 23:52:51 UTC

[incubator-netbeans] branch master updated (73b5575 -> 3945b33)

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

junichi11 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git.


    from 73b5575  Merge pull request #871 from matthiasblaesing/netbeans-1241-2
     add ff23407  [NETBEANS-1074] Module Review php.project
     new 3945b33  Merge pull request #861 from junichi11/module-review-php.project

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:
 php/php.project/build.xml                          |   6 +-
 php/php.project/external/binaries-list             |  18 +-
 .../external/phpsigfiles-1.0-license.txt           |  11 +-
 php/php.project/external/phpsigfiles-license.txt   | 835 ---------------------
 php/php.project/licenseinfo.xml                    |  67 ++
 .../connections/sync/diff/Bundle.properties        |  55 +-
 .../php/project/ui/resources/emptyTraitPHP.php     |  49 +-
 7 files changed, 123 insertions(+), 918 deletions(-)
 copy enterprise/libs.elimpl/external/el-impl-3.0-b07-license.txt => php/php.project/external/phpsigfiles-1.0-license.txt (98%)
 delete mode 100644 php/php.project/external/phpsigfiles-license.txt
 create mode 100644 php/php.project/licenseinfo.xml


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

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists


[incubator-netbeans] 01/01: Merge pull request #861 from junichi11/module-review-php.project

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

junichi11 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git

commit 3945b3379b00468ad607272ddea1ebeda93e8c47
Merge: 73b5575 ff23407
Author: Junichi Yamamoto <ju...@gmail.com>
AuthorDate: Thu Sep 13 08:52:46 2018 +0900

    Merge pull request #861 from junichi11/module-review-php.project
    
    [NETBEANS-1074] Module Review php.project

 php/php.project/build.xml                          |   6 +-
 php/php.project/external/binaries-list             |  18 +-
 .../external/phpsigfiles-1.0-license.txt           | 388 ++++++++++
 php/php.project/external/phpsigfiles-license.txt   | 835 ---------------------
 php/php.project/licenseinfo.xml                    |  67 ++
 .../connections/sync/diff/Bundle.properties        |  55 +-
 .../php/project/ui/resources/emptyTraitPHP.php     |  49 +-
 7 files changed, 505 insertions(+), 913 deletions(-)


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

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists