Skip to content
Snippets Groups Projects
Commit d8f0d4f7 authored by rojas's avatar rojas
Browse files

Merge origin/master

Conflicts:
	examples/nbproject/project.properties
parent 39a3e297
No related branches found
No related tags found
No related merge requests found
...@@ -113,7 +113,7 @@ manifest.custom.codebase= ...@@ -113,7 +113,7 @@ manifest.custom.codebase=
manifest.custom.permissions= manifest.custom.permissions=
meta.inf.dir=${src.dir}/META-INF meta.inf.dir=${src.dir}/META-INF
mkdist.disabled=false mkdist.disabled=false
platform.active=JDK_22 platform.active=default_platform
project.licensePath=../license.txt project.licensePath=../license.txt
run.classpath=\ run.classpath=\
${javac.classpath}:\ ${javac.classpath}:\
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
<configuration> <configuration>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3"> <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>Networked Graphics MV3500 assignments</name> <name>Networked Graphics MV3500 assignments</name>
<explicit-platform explicit-source-supported="true"/>
<source-roots> <source-roots>
<root id="src.dir"/> <root id="src.dir"/>
</source-roots> </source-roots>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment