X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=Kalender%2F2014-12-18%2Findex.mdwn;h=b853d1bea6eff970d38d9dc4f289efa7141e6645;hb=8b10fc936018a9914c7256390240d004c590951f;hp=fbf43e12a6bfa76510a4e72788a55cd1ec3df528;hpb=d5fd113e1e99c3f3e7598ff46c28267761c6e852;p=debienna.git

diff --git a/Kalender/2014-12-18/index.mdwn b/Kalender/2014-12-18/index.mdwn
index fbf43e1..b853d1b 100644
--- a/Kalender/2014-12-18/index.mdwn
+++ b/Kalender/2014-12-18/index.mdwn
@@ -16,6 +16,10 @@ ab 19:00 ist der Raum reserviert
 * [New and fun things in Debian](http://www.enricozini.org/2014/debian/fun-and-sanity/)
 * [Barbie the debian developer](http://blog.halon.org.uk/2014/11/barbie-the-debian-developer/?utm_source=rss&utm_medium=rss&utm_campaign=barbie-the-debian-developer)
 
+### Vorträge
+
+* SebastianBachmann könnte über Android Reverse Engineering erzählen (allerdings nicht
+        Debian Spezifisch...)
 
 ### Fragen & Antworten
 
@@ -28,6 +32,9 @@ ab 19:00 ist der Raum reserviert
  * many new tools, including progress in GUI
  * hosts plugin with full comment support
  * Plugin+Binding in Java
+* [Trinity Desktop Environment R14.0.0](https://www.trinitydesktop.org/)
+* [Christmas wishlist](https://www.defectivebydesign.org/print-this-guide)
+ * Wlan USB Stick works nice..
 * ...