You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ge...@apache.org on 2018/07/11 13:03:12 UTC

[incubator-netbeans] branch master updated (a640484 -> 396c685)

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

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


    from a640484  Merge pull request #620 from rtaneja1/rtaneja/donation2_merge268649
     add 67b2d28  NETBEANS-1035: Made org.netbeans.modules.web.wicket a friend of html.editor and html.editor.lib modules.
     new 396c685  Merge pull request #632 from pnabbefeld/master

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:
 html.editor.lib/nbproject/project.xml | 3 ++-
 html.editor/nbproject/project.xml     | 3 ++-
 2 files changed, 4 insertions(+), 2 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


[incubator-netbeans] 01/01: Merge pull request #632 from pnabbefeld/master

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

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

commit 396c685f1bf0ccae245925d78686c7545aedad7e
Merge: a640484 67b2d28
Author: Geertjan Wielenga <ge...@oracle.com>
AuthorDate: Wed Jul 11 15:03:09 2018 +0200

    Merge pull request #632 from pnabbefeld/master
    
    NETBEANS-1035: Made org.netbeans.modules.web.wicket a friend of html.…

 html.editor.lib/nbproject/project.xml | 3 ++-
 html.editor/nbproject/project.xml     | 3 ++-
 2 files changed, 4 insertions(+), 2 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