From: Anthony Towns <aj@erisian.com.au>
Date: Tue, 28 Sep 2010 02:55:47 +0000 (+1000)
Subject: Merge branch 'master' of git://git.gag.com/fw/altos
X-Git-Tag: debian/0.7.1+28+gd8a2f4c~6
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=e2b9f47a205348d38756c70e928a2a9183de6884

Merge branch 'master' of git://git.gag.com/fw/altos
---

e2b9f47a205348d38756c70e928a2a9183de6884
diff --cc ao-tools/altosui/Makefile.am
index 35a1b990,7070af22..ab8ca7d4
--- a/ao-tools/altosui/Makefile.am
+++ b/ao-tools/altosui/Makefile.am
@@@ -48,21 -51,10 +51,21 @@@ altosui_JAVA = 
  	AltosState.java \
  	AltosStatusTable.java \
  	AltosTelemetry.java \
- 	AltosTelemetryReader.java \
+ 	AltosTelemetryIterable.java \
  	AltosUI.java \
 +    AltosCsvReader.java \
 +    AltosDataPoint.java \
 +    AltosGraph.java \
 +    AltosGraphTime.java \
 +    AltosGraphUI.java \
 +    AltosGraphDataChooser.java \
  	AltosVoice.java
  
 +JFREECHART_CLASS= \
 +    jfreechart.jar \
 +    jcommon.jar \
 +    csv.jar
 +
  FREETTS_CLASS= \
  	cmudict04.jar \
  	cmulex.jar \