Skip to content
Snippets Groups Projects
Commit e0e04521 authored by J. M. Bailey's avatar J. M. Bailey
Browse files

Merge origin/master 

Conflicts:
	nbproject/project.properties
parents 52c1e128 bd438dad
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 16 additions and 17 deletions
nbproject/project.xml
+ 16
− 17
View file @ e0e04521
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1"> <project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.java.j2seproject</type> <type>org.netbeans.modules.java.j2seproject</type>
<configuration> <configuration>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3"> <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>open-dis7-java</name> <name>open-dis7-java</name>
<explicit-platform explicit-source-supported="true"/> <source-roots>
<source-roots> <root id="src.src-generated.dir"/>
<root id="src.src-generated.dir"/> <root id="src.dir"/>
<root id="src.dir"/> </source-roots>
</source-roots> <test-roots>
<test-roots> <root id="test.src.dir"/>
<root id="test.src.dir"/> </test-roots>
</test-roots> </data>
</data> </configuration>
</configuration> </project>
</project>
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