Merge pull request #97 from LoadingPleaseWait/master

Changed the name of _2585robophiles to impact2585 for lib2585 imports
Impact2585 · Jan 20, 2016 · 1961b8f · 1961b8f
2 parents c121c91 + 02ac0ba
commit 1961b8f
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 10 deletions.
diff --git a/lib/Lib2585.jar b/lib/Lib2585.jar
diff --git a/src/org/impact2585/frc2015/AutonomousExecuter.java b/src/org/impact2585/frc2015/AutonomousExecuter.java
@@ -1,6 +1,6 @@
 package org.impact2585.frc2015;
 
-import org._2585robophiles.lib2585.Executer;
+import org.impact2585.lib2585.Executer;
 import org.impact2585.frc2015.systems.LiftSystem;
 
 /**

diff --git a/src/org/impact2585/frc2015/Environment.java b/src/org/impact2585/frc2015/Environment.java
@@ -1,6 +1,6 @@
 package org.impact2585.frc2015;
 
-import org._2585robophiles.lib2585.RobotEnvironment;
+import org.impact2585.lib2585.RobotEnvironment;
 import org.impact2585.frc2015.input.InputMethod;
 import org.impact2585.frc2015.input.XboxInput;
 import org.impact2585.frc2015.systems.AccelerometerSystem;

diff --git a/src/org/impact2585/frc2015/Robot.java b/src/org/impact2585/frc2015/Robot.java
@@ -1,6 +1,6 @@
 package org.impact2585.frc2015;
 
-import org._2585robophiles.lib2585.ExecuterBasedRobot;
+import org.impact2585.lib2585.ExecuterBasedRobot;
 
 /**
  * The VM is configured to automatically run this class, and to call the

diff --git a/src/org/impact2585/frc2015/TeleopExecuter.java b/src/org/impact2585/frc2015/TeleopExecuter.java
@@ -1,6 +1,6 @@
 package org.impact2585.frc2015;
 
-import org._2585robophiles.lib2585.RunnableExecuter;
+import org.impact2585.lib2585.RunnableExecuter;
 
 
 /**

diff --git a/src/org/impact2585/frc2015/TestExecuter.java b/src/org/impact2585/frc2015/TestExecuter.java
@@ -1,6 +1,6 @@
 package org.impact2585.frc2015;
 
-import org._2585robophiles.lib2585.Executer;
+import org.impact2585.lib2585.Executer;
 import org.impact2585.frc2015.input.InputMethod;
 
 import edu.wpi.first.wpilibj.Joystick;

diff --git a/src/org/impact2585/frc2015/input/PartnerXboxInput.java b/src/org/impact2585/frc2015/input/PartnerXboxInput.java
@@ -1,6 +1,6 @@
 package org.impact2585.frc2015.input;
 
-import org._2585robophiles.lib2585.XboxConstants;
+import org.impact2585.lib2585.XboxConstants;
 
 import edu.wpi.first.wpilibj.Joystick;
 

diff --git a/src/org/impact2585/frc2015/input/XboxInput.java b/src/org/impact2585/frc2015/input/XboxInput.java
@@ -1,6 +1,6 @@
 package org.impact2585.frc2015.input;
 
-import org._2585robophiles.lib2585.XboxConstants;
+import org.impact2585.lib2585.XboxConstants;
 
 import edu.wpi.first.wpilibj.Joystick;
 

diff --git a/src/org/impact2585/frc2015/systems/LiftSystem.java b/src/org/impact2585/frc2015/systems/LiftSystem.java
@@ -1,6 +1,6 @@
 package org.impact2585.frc2015.systems;
 
-import org._2585robophiles.lib2585.MultiMotor;
+import org.impact2585.lib2585.MultiMotor;
 import org.impact2585.frc2015.Environment;
 import org.impact2585.frc2015.RobotMap;
 import org.impact2585.frc2015.input.InputMethod;

diff --git a/src/org/impact2585/frc2015/systems/RobotSystem.java b/src/org/impact2585/frc2015/systems/RobotSystem.java
@@ -1,6 +1,6 @@
 package org.impact2585.frc2015.systems;
 
-import org._2585robophiles.lib2585.Destroyable;
+import org.impact2585.lib2585.Destroyable;
 import org.impact2585.frc2015.Initializable;
 
 /**

diff --git a/src/org/impact2585/frc2015/systems/WheelSystem.java b/src/org/impact2585/frc2015/systems/WheelSystem.java
@@ -1,6 +1,6 @@
 package org.impact2585.frc2015.systems;
 
-import org._2585robophiles.lib2585.MultiMotor;
+import org.impact2585.lib2585.MultiMotor;
 import org.impact2585.frc2015.Environment;
 import org.impact2585.frc2015.RobotMap;
 import org.impact2585.frc2015.input.InputMethod;