Maker Faire 2015 Planung erstellt

[stratum0-wiki.git] / Anime_Referat.mw

diff --git a/Anime_Referat.mw b/Anime_Referat.mw
index f91f25f..73b6d38 100644 (file)
--- a/Anime_Referat.mw
+++ b/Anime_Referat.mw
@@ -29,32 +29,32 @@ Mögliche Genres können sein:
 |-
 ! Titel !! Status !! Kategorie !! Studio !! Director !! Composition !! Original Work !! noteworthy
 |-
 |-
 ! Titel !! Status !! Kategorie !! Studio !! Director !! Composition !! Original Work !! noteworthy
 |-

-| [http://anidb.net/perl-bin/animedb.pl?show=anime&aid=9541 進撃の巨人 attack on titan]
-| <div align="center">{{Composition bar|25|25|red}}</div>
-| Action, Shonen<br>Gore || Wit Studio<br>Production IG || Araki Tetsurou || || (Manga):<br>by Isayama Hajime
+| [Adventure & Fantasy-Slot]
+| colspan="7" | https://dudle.inf.tu-dresden.de/Aniref2015-Slot1/

 |-
 | [http://anidb.net/perl-bin/animedb.pl?show=anime&aid=1176 Ghost in the Shell: Stand Alone Complex 2nd Gig]
 | <div align="center">{{Composition bar|14|26|darkblue}}</div>
 | SciFi<br>Transhumanism || ~Production IG~ || Kamiyama Kenji || Kamiyama Kenji || Masamune Shirou
 |-
 |-
 | [http://anidb.net/perl-bin/animedb.pl?show=anime&aid=1176 Ghost in the Shell: Stand Alone Complex 2nd Gig]
 | <div align="center">{{Composition bar|14|26|darkblue}}</div>
 | SciFi<br>Transhumanism || ~Production IG~ || Kamiyama Kenji || Kamiyama Kenji || Masamune Shirou
 |-

-| [http://anidb.net/perl-bin/animedb.pl?show=anime&aid=3654 怪~ayakashi~ JAPANESE CLASSIC HORROR]
-| <div align="center">{{Composition bar|10|11|brown}}</div>
-| historical<br>horror || Toei Animation || Imazawa Tetsuo<br>Nakamura Kenji || || Tsuruya Nanboku<br>Izumi Kyouka || Prequel: Mononoke
-|-
-| [http://anidb.net/perl-bin/animedb.pl?show=anime&aid=317 Jungle wa Itsumo Hale nocchi Guu<br>Deluxe]
-| <div align="center">{{Composition bar|05|06|pink}}</div>
-| comedy<br>slapstick<br>psychology ||  || Mizushima Tsutomu || Yokote Michiko || Kindaichi Renjuurou
+| [Art, Horror & other serious stuff-Slot]
+| colspan="7" | https://dudle.inf.tu-dresden.de/Aniref2015-Slot3/

 |-
 |-

+| [Fun-Slot]
+| colspan="7" | https://dudle.inf.tu-dresden.de/hk8m49bv/

 |}
 
 ==Abstimmungen==
 all new:<br>
 |}
 
 ==Abstimmungen==
 all new:<br>

-https://dudle.inf.tu-dresden.de/Aniref2014-Slot4/
+https://dudle.inf.tu-dresden.de/Aniref2015-Slot1/<br>
+https://dudle.inf.tu-dresden.de/Aniref2015-Slot3/<br>
+https://dudle.inf.tu-dresden.de/hk8m49bv/ (slot4)
+

 
 old & busted:<br>
 
 old & busted:<br>

-https://dudle.inf.tu-dresden.de/Aniref2014-Slot2/
-https://dudle.inf.tu-dresden.de/Aniref2014-Slot3/
+https://dudle.inf.tu-dresden.de/Aniref2014-Slot4/<br>

 https://dudle.inf.tu-dresden.de/Aniref2014-0/ Ghost in the Shell<br>
 https://dudle.inf.tu-dresden.de/Aniref2014-0/ Ghost in the Shell<br>

+https://dudle.inf.tu-dresden.de/Aniref2014-Slot3/<br>
+https://dudle.inf.tu-dresden.de/Aniref2014-Slot2/<br>

 https://dudle.inf.tu-dresden.de/Aniref2014-1/ Alles und der Rest<br>
 http://doodle.com/63h2isyckhepx2ce
 
 https://dudle.inf.tu-dresden.de/Aniref2014-1/ Alles und der Rest<br>
 http://doodle.com/63h2isyckhepx2ce