merge heads

This commit is contained in:
Jimmy Shih
2012-02-28 15:27:45 -08:00
@@ -40,7 +40,7 @@ public class UnitConversions {
public static final double M_TO_KM = 1 / 1000.0;
// multiplication factor to convert meters per second to kilometers per hour
public static final double MS_TO_KMH = M_TO_KM * 60 * 60;
public static final double MS_TO_KMH = 3.6;
// multiplication factor to convert meters to miles
public static final double M_TO_MI = M_TO_KM * KM_TO_MI;