summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.classpath2
-rw-r--r--.gitignore1
-rw-r--r--build.properties4
-rw-r--r--sysProps.xmlbin6125 -> 0 bytes
4 files changed, 5 insertions, 2 deletions
diff --git a/.classpath b/.classpath
index daf6ebb..0c0ebaf 100644
--- a/.classpath
+++ b/.classpath
@@ -2,6 +2,6 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="var" path="wpilib" sourcepath="wpilib.sources"/>
<classpathentry kind="var" path="networktables" sourcepath="networktables.sources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/.gitignore b/.gitignore
index 373e0e2..abc3db7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/build/
/dist/
/doc/
+/sysProps.xml
diff --git a/build.properties b/build.properties
index 297b61f..f1d586e 100644
--- a/build.properties
+++ b/build.properties
@@ -1,4 +1,6 @@
# Project specific information
package=org.usfirst.frc.team4272.robot2016
robot.class=${package}.Robot
-simulation.world.file=/usr/share/frcsim/worlds/GearsBotDemo.world \ No newline at end of file
+simulation.world.file=/usr/share/frcsim/worlds/GearsBotDemo.world
+#Uncomment and point at user libraries to include them in the build. Do not put libraries in the \wpilib\java folder, this folder is completely overwritten on plugin update.
+#userLibs=${user.home}/wpilib/user/lib \ No newline at end of file
diff --git a/sysProps.xml b/sysProps.xml
deleted file mode 100644
index 5f0a23c..0000000
--- a/sysProps.xml
+++ /dev/null
Binary files differ