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

diff --combined altosui/Makefile.am
index de7a86c09536d6fbd0bbe2a0ff18bb3722f62167,2c46da4a5f1f75643782044ad0df14ad45e94883..306a396e6fe5e21ded11331bcfc7ae6fc9ac2266
--- 1/altosui/Makefile.am
--- 2/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