This commit is contained in:
Jeroen Ketelaar
2014-02-18 14:58:09 +01:00
13 changed files with 1256 additions and 23 deletions
+8
View File
@@ -47,4 +47,12 @@ parabotv2/src/META-INF/MANIFEST.MF
.idea/uiDesigner.xml
<<<<<<< HEAD
.idea/libraries/jfxrt.xml
=======
*.jar
*.classpath
*.project
>>>>>>> 18cffe02674768c9927a96cc05d2ae09e803974d