From 09519a982b645167b0545a73397169ff08cebb69 Mon Sep 17 00:00:00 2001
From: Vater <Vater@wiki.c3d2.de/w>
Date: Wed, 2 Jul 2014 14:25:16 +0000
Subject: [PATCH] =?UTF-8?q?spalte=20organisation=20(wer=20organisiert=20di?=
 =?UTF-8?q?e=20veranstalung)=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Chaotische_Veranstaltung.mw | 64 +++++++++++++++++++++++--------------
 1 file changed, 40 insertions(+), 24 deletions(-)

diff --git a/Chaotische_Veranstaltung.mw b/Chaotische_Veranstaltung.mw
index bd9f23d3..166d5fe0 100644
--- a/Chaotische_Veranstaltung.mw
+++ b/Chaotische_Veranstaltung.mw
@@ -3,71 +3,87 @@ __TOC__
 {| class="wikitable"
 |-
 ! Titel
+! Organisation
 ! Website
-! Kurzbeschreibung
+! Kurzbeschreibung<!--
+! regelmäßiges Stattfinden
+! Dauer
+! Entfernung -->
 |-
-! colspan="3" |
+! colspan="4" |
 === [[C3D2]] ===
 |-
 | [[Datenspuren]]
-|
-|
+| [[C3D2]]
+| [https://datenspuren.de/ datenspuren.de]
+| jährliches Symposium vom [[Erfa]] in Dresden
 |-
-! colspan="3" |
+! colspan="4" |
 === andere [[Erfa]]s ===
 |-
 | [[Easterhegg]]<ref>https://events.ccc.de/category/easterhegg/</ref>
-|
-|
+| 
+| 
+| 
 |-
-| [[GPN]]<ref>https://events.ccc.de/category/gpn/</ref>
-| [https://entropia.de/GPN Entropia GPN]
-|
+| [[FrOSCon]]
+| 
+| [https://froscon.de/ froscon.de]
+| 
 |-
-| [[mrmcd]]<ref>https://events.ccc.de/category/mrmcds/</ref>
-| [http://www.metarheinmain.de/ MRMCD]
-|
+| [[GPN]]<ref>https://events.ccc.de/category/gpn/</ref> (Gulaschprogrammiernacht)
+| [[Entropia]]
+| [https://gulas.ch gulas.ch]
+| 
 |-
-| [[SIGINT]]<ref>https://events.ccc.de/category/sigint/</ref>
-|
-|
+| [[Hackover]]
+| [[C3H]]
+| [https://hackover.de/ hackover.de]
+| 
 |-
-! colspan="3" |
+| [[mrmcd]]<ref>https://events.ccc.de/category/mrmcds/</ref> ([http://metarheinmain.de/ MetaRheinMain ChaosDays])
+| 
+| [https://mrmcd.net/ mrmcd.net]
+| 
+|-
+| <s>[[SIGINT]]<ref>https://events.ccc.de/category/sigint/</ref>
+| 
+| [https://sigint.ccc.de/ sigint.ccc.de]
+| 
+|-
+! colspan="4" |
 === [[CCC]] ===
 |-
 | [[Congress]]
 | 
 | 
+| 
 |-
 | [[Camp]]
 | 
 | 
 |-
-! colspan="3" |
+! colspan="4" |
 === Weitere ===
 |-
 | [http://confidence.org.pl Confidence (bisher Ende May)]
 | 
 | 
+| 
 |-
 | [http://ehsm.eu/ Exceptionally Hard & Soft Meeting (Seit 2013 im DESY HH)]
 | 
 | 
+| 
 |-
 | [http://hackaday.mni.thm.de/ hack a day]
 | 
 | 
-|-
-| [http://www.froscon.de/ FrOSCon]
-| 
 | 
 |-
 | [http://brucon.org/ BruCon]
 | 
 | 
-|-
-| [http://hackover.de/ Hackover]
-| 
 | 
 |-
 |}