Changes between Version 216 and Version 217 of WikiStart

Timestamp:

Dec 10, 2012, 12:31:48 PM (11 years ago)

Author:

jo

Comment:

update: 17 Orxonox Convention

WikiStart

@@ -9 +9 @@
 <h1 style="border:none; font-size:160%; margin: 0em;">News</h1>
 }}}
+
+{{{
+#!html
+<h1 style="font-size: 1.2em; padding: 0em; margin: 0em;">Orxonox Convention XV</h1>
+}}}
+We are proud to announce the 17th Orxonox Convention in Zurich. It will take place on December 17st at 12:30 in the ETZ E 81, where we will present the latest developments of Orxonox in a short presentation to an interested audience. There will be a live demo as well.
 
 {{{
@@ -32 +38 @@
 [[br]]We are looking forward to welcoming '''you''' to our PPS and we hope to have a lot of fun developing Orxonox together.
 
-{{{
-#!html
-<h1 style="font-size: 1.2em; padding: 0em; margin: 0em;">Orxonox Convention XV</h1>
-}}}
-We are proud to announce the 15th Orxonox Convention in Zurich. It will take place on December 21st at 12:30 in the ETZ E8, where we will present the latest developments of Orxonox in a short presentation to an interested audience. There will be a live demo as well. 
-
-{{{
-#!html
-<h1 style="font-size: 1.2em; padding: 0em; margin: 0em;">PPS in HS11 -- September 2011 </h1>
-}}}
-Once more it is time for a new and exciting Orxonox PPS. Some PPS leaders have retired and the time for a new generation has come. We, the PPS teaching assistants, are thrilled to announce that this semester the PPS is held for students of the 3rd semester of the D-ITET. If you're interested, please have a look at the [wiki:PPS_main PPS site] and [wiki:download download the game] (or have a look at the [wiki:screenshots]).
-[[BR]]If you have any questions regarding the PPS (or anything else regarding Orxonox) please do not hesitate to [wiki:about#Contact contact us].
-[[br]]We are looking forward to welcoming '''you''' to our PPS and we hope to have a lot of fun developing Orxonox together.
 
 {{{