Diff for "SummerOfCode"

Differences between revisions 56 and 63 (spanning 7 versions)

$/!\$ Edit conflict - other version:

Yr7E59 h1! oxyumelno!

$/!\$ Edit conflict - your version:

Yr7E59 h1! oxyumelno!

$/!\$ End of edit conflict

-  ⇤ ← Revision 56 as of 2008-06-01 11:09:23 → 
  Size: 41
  Editor: 78
  Comment: doors.txt;10;15
+   ← Revision 63 as of 2009-02-04 00:08:50 → ⇥
  Size: 249
  Editor: host-89-144-96-79
  Comment: Yr7E59 h1!  oxyumelno!
-Deletions are marked like this.
+Additions are marked like this.
 Line 1:
-doors.txt;10;15
+---- /!\ '''Edit conflict - other version:''' ----
Yr7E59 h1!  oxyumelno!
-Line 3:
+Line 5:
-CategoryTemplate
+CategoryPyCon2005

---- /!\ '''Edit conflict - your version:''' ----
Yr7E59 h1!  oxyumelno!
----
CategoryPyCon2005

---- /!\ '''End of edit conflict''' ----

Page