geertjanw closed pull request #632: NETBEANS-1035: Made org.netbeans.modules.web.wicket a friend of html.… URL: https://github.com/apache/incubator-netbeans/pull/632
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/html.editor.lib/nbproject/project.xml b/html.editor.lib/nbproject/project.xml index ab4d28843f..8b5714466f 100644 --- a/html.editor.lib/nbproject/project.xml +++ b/html.editor.lib/nbproject/project.xml @@ -272,8 +272,8 @@ <friend>org.netbeans.modules.javascript2.editor</friend> <friend>org.netbeans.modules.javascript2.jade</friend> <friend>org.netbeans.modules.javascript2.jquery</friend> - <friend>org.netbeans.modules.javascript2.requirejs</friend> <friend>org.netbeans.modules.javascript2.react</friend> + <friend>org.netbeans.modules.javascript2.requirejs</friend> <friend>org.netbeans.modules.php.latte</friend> <friend>org.netbeans.modules.ruby.rhtml</friend> <friend>org.netbeans.modules.web.core.syntax</friend> @@ -283,6 +283,7 @@ <friend>org.netbeans.modules.web.jsf.editor</friend> <friend>org.netbeans.modules.web.jsfapi</friend> <friend>org.netbeans.modules.web.livehtml</friend> + <friend>org.netbeans.modules.web.wicket</friend> <package>org.netbeans.modules.html.editor.lib.api</package> <package>org.netbeans.modules.html.editor.lib.api.dtd</package> <package>org.netbeans.modules.html.editor.lib.api.elements</package> diff --git a/html.editor/nbproject/project.xml b/html.editor/nbproject/project.xml index d942d00e96..171480e32e 100644 --- a/html.editor/nbproject/project.xml +++ b/html.editor/nbproject/project.xml @@ -536,9 +536,9 @@ <friend>org.netbeans.modules.html.knockout</friend> <friend>org.netbeans.modules.html.ojet</friend> <friend>org.netbeans.modules.javascript2.editor</friend> - <friend>org.netbeans.modules.javascript2.requirejs</friend> <friend>org.netbeans.modules.javascript2.nodejs</friend> <friend>org.netbeans.modules.javascript2.react</friend> + <friend>org.netbeans.modules.javascript2.requirejs</friend> <friend>org.netbeans.modules.php.latte</friend> <friend>org.netbeans.modules.ruby.rhtml</friend> <friend>org.netbeans.modules.web.clientproject</friend> @@ -547,6 +547,7 @@ <friend>org.netbeans.modules.web.el</friend> <friend>org.netbeans.modules.web.jsf</friend> <friend>org.netbeans.modules.web.jsf.editor</friend> + <friend>org.netbeans.modules.web.wicket</friend> <package>org.netbeans.modules.html.editor.api</package> <package>org.netbeans.modules.html.editor.api.actions</package> <package>org.netbeans.modules.html.editor.api.completion</package> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services --------------------------------------------------------------------- To unsubscribe, e-mail: notifications-unsubscr...@netbeans.apache.org For additional commands, e-mail: notifications-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists