Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum

Conflicts:
	production.mdwn

diff --git a/AltOS/launch-sites.txt b/AltOS/launch-sites.txt
index 411e4cb50d1f5199b5596b40ed4377ad39f8aa42..ab5da4325266b4952f3ac15cf92a0efe3e74bd7f 100644 (file)
--- a/AltOS/launch-sites.txt
+++ b/AltOS/launch-sites.txt
@@ -36,6 +36,7 @@ TRAAU Serpentine:-36.4823466:144.0180150:http://traau.com/
 Tripoli Central Virginia Battle Park:38.398055:-78.065:http://www.battlepark.org
 Tripoli Colorado Hartsel:39.009247:-105.702338:http://tripolicolorado.org
 Tripoli Houston Hearne Airport:30.861146:-96.622149:http://www.tripolihouston002.com/
+Tripoli Idaho Swan Falls:43.23765:-116.32373:http://www.tripoliidaho.org
 Tripoli Louisiana Goldmine Plantation:32.2073:-91.8567:http://www.tra-la.org
 UROC Frank Hunt Field:40.21879:-112.24618:http://www.uroc.org
 VAST Monterey, VA:38.376898:-79.607717:http://www.valleyaerospace.com

diff --git a/production.mdwn b/production.mdwn
index 9a10dc5d579fe0d9e44b23cd68d30b4508e818a7..30738df2a98be2985045e6d30e3da14dbefdfbca 100644 (file)
--- a/production.mdwn
+++ b/production.mdwn
@@ -427,3 +427,9 @@ Production run of 108 pieces of TeleGPS v1.0 by
 ## sn 1982-1983 ##
 
 Build 2 TeleFire v0.2 by Keith 2014.07.12
+
+## sn 1984-2083 ##
+
+Production run of 100 pieces of EasyMega v1.0 by
+[Advanced Circuits](http://4pcb.com), received 2014.08.14.
+