summaryrefslogtreecommitdiff
authorIanOsgood <IanOsgood@web>2011-01-26 04:35:01 (GMT)
committer Portland State Aerospace Society <psas@psas.svcs.cs.pdx.edu>2011-01-26 04:35:01 (GMT)
commit9db944ac4e6fb6ab083ba86155e07a43541f7965 (patch) (side-by-side diff)
tree38114a65a08718f35f4db6dd19873880bda9e117
parent67390c8a14b5e3d055da408144746dffa236abb0 (diff)
downloadwiki-9db944ac4e6fb6ab083ba86155e07a43541f7965.zip
wiki-9db944ac4e6fb6ab083ba86155e07a43541f7965.tar.gz
move new news to top
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--PropulsionTeamHome.mdwn11
1 files changed, 8 insertions, 3 deletions
diff --git a/PropulsionTeamHome.mdwn b/PropulsionTeamHome.mdwn
index 4d8ac40..02114ba 100644
--- a/PropulsionTeamHome.mdwn
+++ b/PropulsionTeamHome.mdwn
@@ -6,14 +6,19 @@ After a five year hiatus, a small number of PSAS folks are again interested in p
**What We're Working On:** Currently we are developing motor technologies that will allow for a throttleable motor and also one capable of thrust vector control.
-[[2012 Liquid Motor Notes]]
+- [[2012 Liquid Motor Notes]]
+- [[Staging]]
-[[Staging]]
+## Project resources
- **Propulsion Team Mailing list:** [psas-propulsion](http://lists.psas.pdx.edu/mailman/listinfo/psas-propulsion)
- **Upcoming Meetings:** [[Schedule]]
-## Old History (paraffin hybrid engine) <!-- TODO: move to another page -->
+## Propulsion team meeting minutes:
+
+- [[news/2010-12-14]]: A new beginning
+
+# Old History (paraffin hybrid engine) <!-- TODO: move to another page -->
After the crash in 2005, the hybrid team leader left the group. The hybrid prototype was mothballed, and there was no further interest in propulsion design until 2010.