Merge "Image v20"

2026-06-26 01:51:41 +00:00 · 2014-12-05 11:42:40 -08:00
parent 5e6cd0bf9e cd01945908
commit 6abde412c1
6 changed files with 2 additions and 2 deletions
--- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/build.properties
+++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/build.properties
@@ -8,7 +8,7 @@ command.dir=/home/lvuser/
 # Libraries to use
 wpilib=${user.home}/wpilib/cpp/${cpp-version}
 wpilib.lib=${wpilib}/lib
-roboRIOAllowedImages=19
+roboRIOAllowedImages=20

 # Ant support
 wpilib.ant.dir=${wpilib}/ant
--- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/build.properties
+++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/build.properties
@@ -20,7 +20,7 @@ networktables.sources=${wpilib.lib}/NetworkTables-sources.jar
 #jnaerator.jar=${wpilib.lib}/jnaerator-runtime.jar
 #classpath=${wpilib.jar}:${networktables.jar}:${jna.jar}:${jnaerator.jar}
 classpath=${wpilib.jar}:${networktables.jar}
-roboRIOAllowedImages=19
+roboRIOAllowedImages=20

 # Ant support
 wpilib.ant.dir=${wpilib}/ant
--- a/ni-libraries/libFRC_NetworkCommunication.so.1.5.0
+++ b/ni-libraries/libFRC_NetworkCommunication.so.1.5.0
--- a/ni-libraries/libFRC_NetworkCommunicationLV.so.1.5.0
+++ b/ni-libraries/libFRC_NetworkCommunicationLV.so.1.5.0
--- a/ni-libraries/libi2c.so.1.0.0
+++ b/ni-libraries/libi2c.so.1.0.0
--- a/ni-libraries/libspi.so.1.0.0
+++ b/ni-libraries/libspi.so.1.0.0