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

diff --cc ao-tools/altosui/Makefile
index 541b89e3847128bd0c21fb0663bfb8ff4e852673,bae42c9ac14cd41d565db70cbe568bf03938abc0..63359fbbf4be82e3c01b970f3baf4c6370ebb203
--- 1/ao-tools/altosui/Makefile
--- 2/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@@ -1,20 -1,11 +1,20 @@@
  .SUFFIXES: .java .class
  
- CLASSPATH=classes:./*
+ CLASSPATH=classes:./*:/usr/share/java/*
  CLASSFILES=\
 +      Altos.class \
 +      AltosChannelMenu.class \
 +      AltosConfig.class \
 +      AltosConfigUI.class \
        AltosConvert.class \
 -      AltosEeprom.class \
 +      AltosCSV.class \
 +      AltosEepromDownload.class \
        AltosEepromMonitor.class \
 +      AltosEepromReader.class \
 +      AltosEepromRecord.class \
        AltosFile.class \
 +      AltosFlightInfoTableModel.class \
 +      AltosFlightStatusTableModel.class \
        AltosGPS.class \
        AltosGreatCircle.class \
        AltosLog.class \
@@@ -31,18 -20,19 +31,19 @@@
        AltosDeviceDialog.class \
        AltosVoice.class
  
- FREETTSSRC=/home/keithp/src/freetts/freetts-1.2.2
- FREETTSLIB=$(FREETTSSRC)/lib
- FREETTSJAR= \
-       cmudict04.jar \
-       cmulex.jar \
-       cmu_time_awb.jar \
-       cmutimelex.jar \
-       cmu_us_kal.jar \
-       en_us.jar \
-       freetts.jar
+ #FREETTSSRC=/home/keithp/src/freetts/freetts-1.2.2
+ #FREETTSLIB=$(FREETTSSRC)/lib
+ #FREETTSJAR=/usr/share/java/freetts.jar
+ #FREETTSJAR= \
+ #     cmudict04.jar \
+ #     cmulex.jar \
+ #     cmu_time_awb.jar \
+ #     cmutimelex.jar \
+ #     cmu_us_kal.jar \
+ #     en_us.jar \
+ #     freetts.jar
  
 -JAVAFLAGS=-Xlint:unchecked
 +JAVAFLAGS=-Xlint:unchecked -Xlint:deprecation
  
  OS:=$(shell uname)