summaryrefslogtreecommitdiff
authorJamey Sharp <jamey@minilop.net>2009-12-07 17:45:46 (GMT)
committer Jamey Sharp <jamey@minilop.net>2009-12-07 17:45:46 (GMT)
commit9839a207415be9af6956adf73aaad0ae4e2210f7 (patch) (side-by-side diff)
tree00603514ef5639873612070b2671fe6c1315404a
parent76b33065063ad202963621f59bf2200a722a4d82 (diff)
downloadwiki-9839a207415be9af6956adf73aaad0ae4e2210f7.zip
wiki-9839a207415be9af6956adf73aaad0ae4e2210f7.tar.gz
Gather more presentations to the Presentations page.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Presentations.mdwn3
-rw-r--r--Presentations/psas-talk.odp (renamed from Resources/psas-talk.odp)bin32722626 -> 32722626 bytes
-rw-r--r--Presentations/wuerzburg-2005-crs.odp (renamed from Resources/wuerzburg-2005-crs.odp)bin576005 -> 576005 bytes
-rw-r--r--Resources.mdwn6
4 files changed, 4 insertions, 5 deletions
diff --git a/Presentations.mdwn b/Presentations.mdwn
index 98ae356..e31c486 100644
--- a/Presentations.mdwn
+++ b/Presentations.mdwn
@@ -5,6 +5,7 @@ Some of the presentations and talks we've given at conferences and community eve
- 2006/12/16: 'To orbit on a budget': NW AIAA and NW IEEE AESS at the Museum of Flight in Seatle, WA
- 2006/10/17: Exhibitor's booth at DASC 2006 ([[news/2006-10-17]])
- 2006/05/27: [FreedomHEC 2006](http://freedomhec.pbwiki.com/2006)
+- 2005/11/30: Bart spoke in [[Wuerzburg|wuerzburg-2005-crs.odp]]
- 2004/07/17: [[news/2004-07-17]]
- 2004/06/06: [[news/2004-06-06]]
- 2003/07/19: [[news/2003-07-19]]
@@ -12,3 +13,5 @@ Some of the presentations and talks we've given at conferences and community eve
- 2003/06/12: [[news/2003-06-12]]
- 2002/07/20: [[news/2002-07-20]]
- 2002/05/19: PDXBOT.02 ([[news/2002-05-19]])
+
+Andrew has a set of [[standard slides|psas-talk.odp]] that he modifies for each talk.
diff --git a/Resources/psas-talk.odp b/Presentations/psas-talk.odp
index ffd147e..ffd147e 100644
--- a/Resources/psas-talk.odp
+++ b/Presentations/psas-talk.odp
Binary files differ
diff --git a/Resources/wuerzburg-2005-crs.odp b/Presentations/wuerzburg-2005-crs.odp
index 33b55aa..33b55aa 100644
--- a/Resources/wuerzburg-2005-crs.odp
+++ b/Presentations/wuerzburg-2005-crs.odp
Binary files differ
diff --git a/Resources.mdwn b/Resources.mdwn
index 755704d..c177d47 100644
--- a/Resources.mdwn
+++ b/Resources.mdwn
@@ -11,9 +11,7 @@ Most of the important resources reside on the various project and team pages. He
- [[PSAS workshop on EAGLE printed circuit board layout program|EagleCadWorkshopNotes]]
- [[Project conventions for coordinate systems|CoordinateSystem]]
- [[Project conventions for mathematical symbols|MathSymbols]]
-- Presentations (in [[OpenDoc]] .odp format):
- - Andrew's standard talk [[slides|psas-talk.odp]]
- - My Wuerzburg talk [[slides|wuerzburg-2005-crs.odp]]
+- [[Presentations]] we've given
It's always helpful to have people around with amateur radio licenses, especially when we're in the middle of a desert somewhere. Here are some useful links if you're interested in getting your license:
@@ -28,8 +26,6 @@ Here's a page devoted to the science and research behind rockets: cross-discipli
- [[RocketScience]]
-Also see our old, very outdated [[psas/resources]] page.
-
Here's a page that links to all of our movies available on the site prior to 10 June 2005. Someone needs to make this auto-update.
- [[PSASMovieListings]]