From: Keith Packard Date: Wed, 10 Aug 2011 22:43:53 +0000 (-0700) Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=b6bcddcb9c1b8a144f014e423f88a9e90a4f6b6e;p=web%2Faltusmetrum Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum Conflicts: AltOS/launch-sites.txt Signed-off-by: Keith Packard --- b6bcddcb9c1b8a144f014e423f88a9e90a4f6b6e diff --cc AltOS/launch-sites.txt index 8c2910e,b345279..b4ebe40 --- a/AltOS/launch-sites.txt +++ b/AltOS/launch-sites.txt @@@ -7,11 -7,11 +7,11 @@@ KLOUDBusters Rocket Pasture:37.16783333 METRA Pine Island:41.31939:-74.47077:http://metrarocketclub.org/ NCR Atlas Site:40.65:-104.38333:http://ncrocketry.org/ NCR Pawnee North Site:40.885955:-104.63793:http://ncrocketry.org/ -OPROC Discovery Bay:47.97808,-122.896383 -OROC Brothers:43.79949786336483:-120.6485810681392 -OROC Sheridan:45.044176:-123.314323 -OROC Wilsonville:45.297186:-122.759067 +OPROC Discovery Bay:47.97808,-122.896383:http://4hrockets.blogspot.com/ +OROC Brothers:43.79949786336483:-120.6485810681392:http://www.oregonrocketry.com/ +OROC Sheridan:45.044176:-123.314323:http://www.oregonrocketry.com/ +OROC Wilsonville:45.297186:-122.759067:http://www.oregonrocketry.com/ - QRS Cedar Grove:-27.8512283:152.9624000:http://www.qldrocketry.com/ + QRS Cedar Grove:-27.8512283:152.9624000:http://qldrocketry.com/ SCORE Hudson Ranch:38.155602777777778:-104.809119444444444:http://scronline.net/ Tripoli Colorado Hartsel:39.009247:-105.702338:http://tripolicolorado.org/ -WAC Sportsman Club:47.815327777777778:-119.427186111111111 +WAC Sportsman Club:47.815327777777778:-119.427186111111111:http://www.washingtonaerospace.org/