altoslib: Clean up random rebase failures
authorKeith Packard <keithp@keithp.com>
Sun, 3 Jun 2012 02:59:40 +0000 (19:59 -0700)
committerKeith Packard <keithp@keithp.com>
Sun, 3 Jun 2012 02:59:40 +0000 (19:59 -0700)
commitf86dac643081987c8994ab57a96640d5e91b342a
treecc175f18f8930c04be16bb4c12b756782ecff568
parentdd43a2ae7594f062a8980d1756a07488ee54b447
altoslib: Clean up random rebase failures

Signed-off-by: Keith Packard <keithp@keithp.com>
14 files changed:
altoslib/AltosConfigData.java
altoslib/AltosEepromIterable.java
altoslib/AltosIMU.java
altoslib/AltosLib.java
altoslib/AltosMag.java
altoslib/AltosMs5607.java
altoslib/AltosRecord.java
altoslib/AltosState.java
altoslib/AltosTelemetryReader.java
altoslib/AltosTelemetryRecord.java
altoslib/AltosTelemetryRecordLegacy.java
altosui/Altos.java
altosui/AltosSerial.java
altosui/Makefile.am