From: Bdale Garbee <bdale@gag.com>
Date: Tue, 24 Aug 2010 05:11:22 +0000 (-0600)
Subject: Merge branch 'new-packet-format' of ssh://git.gag.com/scm/git/fw/altos into new-packa... 
X-Git-Tag: debian/0.6+373+gcf65c6b~1^2~11
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=295043112ccde35092945c286596f9045ee6fa05

Merge branch 'new-packet-format' of ssh://git.gag.com/scm/git/fw/altos into new-package-format
---

295043112ccde35092945c286596f9045ee6fa05
diff --cc ao-tools/altosui/Makefile
index 63359fbb,affbac39..d4d3ee7a
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@@ -29,19 -33,20 +33,21 @@@ CLASSFILES=
  	AltosUI.class \
  	AltosDevice.class \
  	AltosDeviceDialog.class \
+ 	AltosRomconfig.class \
+ 	AltosRomconfigUI.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 -Xlint:deprecation