projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into branch-1.8
[fw/altos]
/
altoslib
/
AltosEepromDownload.java
diff --git
a/altoslib/AltosEepromDownload.java
b/altoslib/AltosEepromDownload.java
index 8a2053ecd4a8ae809a293354dd220e8cec1ca778..33f0dd177997104e1bd1f8e8eabf0e2d8aff1fd2 100644
(file)
--- a/
altoslib/AltosEepromDownload.java
+++ b/
altoslib/AltosEepromDownload.java
@@
-16,7
+16,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_1
1
;
+package org.altusmetrum.altoslib_1
2
;
import java.io.*;
import java.util.*;
import java.io.*;
import java.util.*;
@@
-181,7
+181,7
@@
public class AltosEepromDownload implements Runnable {
}
/* Construct our internal representation of the eeprom data */
}
/* Construct our internal representation of the eeprom data */
- AltosEeprom
New eeprom = new AltosEepromNew
(flights.config_data, data);
+ AltosEeprom
eeprom = new AltosEeprom
(flights.config_data, data);
/* Now see if we can't actually parse the resulting
* file to generate a better filename. Note that this
/* Now see if we can't actually parse the resulting
* file to generate a better filename. Note that this