From: Bdale Garbee <bdale@gag.com>
Date: Tue, 23 Oct 2012 15:38:36 +0000 (-0600)
Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
X-Git-Tag: 1.1.9.2~32
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=055f3232decc07e064d596469b81cf9869411c2d;hp=-c

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

055f3232decc07e064d596469b81cf9869411c2d
diff --combined altosui/Makefile.am
index de7a86c0,2c46da4a..306a396e
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@@ -24,6 -24,7 +24,7 @@@ altosui_JAVA = 
  	AltosConfig.java \
  	AltosConfigFreqUI.java \
  	AltosConfigUI.java \
+ 	AltosConfigPyroUI.java \
  	AltosConfigureUI.java \
  	AltosConfigTD.java \
  	AltosConfigTDUI.java \
@@@ -338,3 -339,5 +339,3 @@@ $(WINDOWS_DIST): $(WINDOWS_FILES) altos
  	-rm -f $@
  	makensis -Oaltos-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" altos-windows.nsi
  
 -publish:
 -	scp launch-sites.txt gag.com:public_html