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

Merge origin/master 

Conflicts:
	examples/nbproject/project.properties
parent a3a3e9cd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
examples/nbproject/project.xml
+ 0
− 1
View file @ 4525179c
...@@ -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 examples</name> <name>Networked Graphics MV3500 examples</name>
<explicit-platform explicit-source-supported="true"/>
<source-roots> <source-roots>
<root id="src.dir"/> <root id="src.dir"/>
<root id="src.src.dir"/> <root id="src.src.dir"/>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment