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

Merge origin/master 

Conflicts:
	examples/nbproject/project.properties
parent 6ab5cc14
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
examples/src/ViskitOpenDis7Examples/viskitProject.xml
+ 0
− 3
View file @ 82eff654
......@@ -9,7 +9,4 @@
</BuildDirectory>
<DistDirectory name="dist" />
<LibDirectory name="lib" />
<Cached />
<extraClassPaths>
</extraClassPaths>
</ViskitProject>
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