diff options
| author | Keith Packard <keithp@keithp.com> | 2011-08-10 15:43:53 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-08-10 15:43:53 -0700 |
| commit | b6bcddcb9c1b8a144f014e423f88a9e90a4f6b6e (patch) | |
| tree | 6f64da26f51000e4c21009376f29dc226a0b83d4 /AltOS | |
| parent | c60d63510271f9eeb2dea40c178d1a165105d877 (diff) | |
| parent | 8dd52febfa2a6ff6b2bba912dd3afbff4af90c0d (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
Conflicts:
AltOS/launch-sites.txt
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'AltOS')
| -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 8c2910e..b4ebe40 100644 --- a/AltOS/launch-sites.txt +++ b/AltOS/launch-sites.txt @@ -11,7 +11,7 @@ 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:http://www.washingtonaerospace.org/ |