Merge pull request #163 from gjacobrobertson/master

NERO overhaul
nnrg · May 15, 2016 · 43e12a1 · 43e12a1
2 parents fedf335 + fac7b6a
commit 43e12a1
Show file tree

Hide file tree

Showing 53 changed files with 1,194 additions and 4,555 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,4 +16,5 @@ java/OpenNERO/target
 /java/jsyntaxpane/jsyntaxpane/target/
 /java/pyrolite-export/nbproject/private
 /java/pyrolite/target/
-/build/
+/build/
+.DS_Store