diff options
| author | Bdale Garbee <bdale@gag.com> | 2011-11-26 22:50:35 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2011-11-26 22:50:35 -0700 |
| commit | 6c606ee032a5b27e7baadfc46734f23bddbaeb6c (patch) | |
| tree | f0bec6261d54587be295cbd99b5d876a7280d6f9 | |
| parent | 16e92eb35101b2a7549b4f7253b3bba412a7d813 (diff) | |
| parent | 527d0da7ba4338f0bbab5db675e5e0247996107e (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
Conflicts:
AltOS/launch-sites.txt
| -rw-r--r-- | AltOS/launch-sites.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/AltOS/launch-sites.txt b/AltOS/launch-sites.txt index fdc2cea..2bc1e38 100644 --- a/AltOS/launch-sites.txt +++ b/AltOS/launch-sites.txt @@ -6,7 +6,7 @@ COSROCS Challenger:38.99624:-104.773979:http://cosrocs.org/ COSROCS Peyton:39.072695:-104.430031:http://cosrocs.org/ HARA Bragg Farms:34.895875:-86.616211;http://www.hararocketry.org/HARA/Main.html KLOUDBusters Rocket Pasture:37.167833333:-97.73975:http://kloudbusters.org/ -MDRA Higgs Farm:39.07854:-75.87634:http://www.mdrocketry.org/ +MDRA Higgs Farm:39.07854167:-75.87634583:http://www.mdrocketry.org/ 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/ |