Changes between Version 202 and Version 203 of WikiStart

Timestamp:

Dec 15, 2010, 8:46:15 AM (13 years ago)

Author:

dafrick

Comment:

—

WikiStart

@@ -10 +10 @@
 }}}
 
+{{{
+#!html
+<h1 style="font-size: 1.2em; padding: 0em; margin: 0em;">Orxonox Convention XIII</h1>
+}}}
+We're proud to announce the 13th Orxonox Convention in Zurich. It will take place on Dec 22nd at 12:30 in the HG F33.5. We will present the latest developments and achievements of Orxonox in a short presentation with a live demo.
+You can find the flyer [http://svn.orxonox.net/webdev/conventions/13/poster.jpg here].
 
 {{{
@@ -36 +42 @@
 with a live demo.
 You can find the flyer [http://svn.orxonox.net/webdev/pps/fs10/convention12_16_borg9.png here].
-
-{{{
-#!html
-<h1 style="font-size: 1.2em; padding: 0em; margin: 0em;">Orxonox in Blitz -- April 20th, 2010 </h1>
-}}}
-[wiki:FabianLandau x3n] wrote an article for the [http://www.blitz.ethz.ch Blitz], the student magazine of the electrical and mechanical engineers at ETH Zürich. The article with the title "Pizza und Spiele" (allusion to [http://en.wikipedia.org/wiki/Brot_und_Spiele "Brot und Spiele"]) is written in German and is about Orxonox in general and the PPS course we offer for students of out department at the ETH. Pizzas and Coke are very important for our nightly coding sessions and we are grateful to the [http://www.amiv.ethz.ch AMIV] for paying our bills. x3n explains what Orxonox is, how it was founded and how the PPS course came about. The article concludes with an invitation to the next presentation where the students of the PPS will present their projects.
-
-Grab your copy of the Blitz during the following two weeks at the ETH or read the [http://www.blitz.ethz.ch/pdf/fs10/blitz09_fs10.pdf online version].
 
 [wiki:archive/News more...]