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/10 11:45:30 UTC

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

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 dc04a3e  replaced all references to 1.10.1 to 1.10.4
     add 7fe2d37  #268649-NPE opening JS file in JsStructureScanner.folds
     new a640484  Merge pull request #620 from rtaneja1/rtaneja/donation2_merge268649

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:
 lexer.nbbridge/nbproject/project.properties        |  2 +-
 .../lexer/nbbridge/MimeLookupLanguageProvider.java | 38 +++++++++++++++++++++-
 2 files changed, 38 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 #620 from rtaneja1/rtaneja/donation2_merge268649

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 a640484d9e7fc5176aa137313699696eca533e4b
Merge: dc04a3e 7fe2d37
Author: Geertjan Wielenga <ge...@oracle.com>
AuthorDate: Tue Jul 10 13:45:27 2018 +0200

    Merge pull request #620 from rtaneja1/rtaneja/donation2_merge268649
    
    #268649-NPE at JsStructureScanner.folds while opening .js file

 lexer.nbbridge/nbproject/project.properties        |  2 +-
 .../lexer/nbbridge/MimeLookupLanguageProvider.java | 38 +++++++++++++++++++++-
 2 files changed, 38 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