From a2c648290d441d29d634dedd2f8373d4f2eb41a5 Mon Sep 17 00:00:00 2001
From: "M.Scholz" <m.scholz88@onlinehome.de>
Date: Tue, 23 Oct 2012 18:16:42 +0200
Subject: [PATCH] merge

---
 .DS_Store                                     | Bin 12292 -> 12292 bytes
 {ws2012 => GIT}/CE/Folien/gms-01-NAE-col.pdf  | Bin
 .../Zusammenfassungen/CEZusammenfassung.pdf   | Bin
 .../EiCE-Zusammenfassung.pdf                  | Bin
 .../ce1_klausur-vorbereitung.pdf              | Bin
 {ws2012 => GIT}/CE/infos.rtf                  |   0
 .../CE/uebungen/EiCE_Uebung_00b.pdf           | Bin
 .../Hiwi TK/JSON-Format/json_testen.txt       |   0
 .../Hiwi TK/JSON-Format/new json.pdf          | Bin
 .../Hiwi TK/JSON-Format/new json.txt          |   0
 .../Hiwi TK/Noisemap 2x API Calls.pdf         | Bin
 .../Notizen Treffen Immanuel/2012_10_01.rtf   |   0
 .../Notizen Treffen Immanuel/2012_10_15.rtf   |   0
 {ws2012 => GIT}/Hiwi TK/dankeskarteChef1.jpg  | Bin
 {ws2012 => GIT}/Hiwi TK/dankeskarteChef2.jpg  | Bin
 {ws2012 => GIT}/P2P/Folien/Lecture_1-1.pdf    | Bin
 {ws2012 => GIT}/P2P/uebungen/1/H1_1.graphml   |   0
 {ws2012 => GIT}/P2P/uebungen/1/H1_1.jpg       | Bin
 {ws2012 => GIT}/P2P/uebungen/1/H1_3.graphml   |   0
 {ws2012 => GIT}/P2P/uebungen/1/H1_3.jpg       | Bin
 {ws2012 => GIT}/P2P/uebungen/1/exercise1.pdf  | Bin
 .../P2P/uebungen/1/exercise1_solution.odt     | Bin
 .../P2P/uebungen/1/exercise1_solution.pdf     | Bin
 {ws2012 => GIT}/P2P/uebungen/1/u1.txt         |   0
 {ws2012 => GIT}/Stundenplan WS12-13.pdf       | Bin
 25 files changed, 0 insertions(+), 0 deletions(-)
 rename {ws2012 => GIT}/CE/Folien/gms-01-NAE-col.pdf (100%)
 rename {ws2012 => GIT}/CE/Zusammenfassungen/CEZusammenfassung.pdf (100%)
 rename {ws2012 => GIT}/CE/Zusammenfassungen/EiCE-Zusammenfassung.pdf (100%)
 rename {ws2012 => GIT}/CE/Zusammenfassungen/ce1_klausur-vorbereitung.pdf (100%)
 rename {ws2012 => GIT}/CE/infos.rtf (100%)
 rename {ws2012 => GIT}/CE/uebungen/EiCE_Uebung_00b.pdf (100%)
 rename {ws2012 => GIT}/Hiwi TK/JSON-Format/json_testen.txt (100%)
 rename {ws2012 => GIT}/Hiwi TK/JSON-Format/new json.pdf (100%)
 rename {ws2012 => GIT}/Hiwi TK/JSON-Format/new json.txt (100%)
 rename {ws2012 => GIT}/Hiwi TK/Noisemap 2x API Calls.pdf (100%)
 rename {ws2012 => GIT}/Hiwi TK/Notizen Treffen Immanuel/2012_10_01.rtf (100%)
 rename {ws2012 => GIT}/Hiwi TK/Notizen Treffen Immanuel/2012_10_15.rtf (100%)
 rename {ws2012 => GIT}/Hiwi TK/dankeskarteChef1.jpg (100%)
 rename {ws2012 => GIT}/Hiwi TK/dankeskarteChef2.jpg (100%)
 rename {ws2012 => GIT}/P2P/Folien/Lecture_1-1.pdf (100%)
 rename {ws2012 => GIT}/P2P/uebungen/1/H1_1.graphml (100%)
 rename {ws2012 => GIT}/P2P/uebungen/1/H1_1.jpg (100%)
 rename {ws2012 => GIT}/P2P/uebungen/1/H1_3.graphml (100%)
 rename {ws2012 => GIT}/P2P/uebungen/1/H1_3.jpg (100%)
 rename {ws2012 => GIT}/P2P/uebungen/1/exercise1.pdf (100%)
 rename {ws2012 => GIT}/P2P/uebungen/1/exercise1_solution.odt (100%)
 rename {ws2012 => GIT}/P2P/uebungen/1/exercise1_solution.pdf (100%)
 rename {ws2012 => GIT}/P2P/uebungen/1/u1.txt (100%)
 rename {ws2012 => GIT}/Stundenplan WS12-13.pdf (100%)

diff --git a/.DS_Store b/.DS_Store
index 40f49cf5878bb89aafecfb2ad11924939709423a..6117473961017552391cd42df55c69849f2503cc 100644
GIT binary patch
delta 113
zcmZokXi1ph&#1jIU^hRb_GTV|U^eF4QIeCB#A4;|6fgh*8$&rmF@q6<0fQlfQCV<N
cUQT{qI#8T(W1=SGW_F1PqBU$jD5oX}0I=2^jsO4v

delta 58
zcmZokXi1ph&#1LAU^hRb)@B}oU^eDkPtQ$G5{qTJ{b6IG8{=kni3nt|%@5_21t%6L
F005B}7YhIY

diff --git a/ws2012/CE/Folien/gms-01-NAE-col.pdf b/GIT/CE/Folien/gms-01-NAE-col.pdf
similarity index 100%
rename from ws2012/CE/Folien/gms-01-NAE-col.pdf
rename to GIT/CE/Folien/gms-01-NAE-col.pdf
diff --git a/ws2012/CE/Zusammenfassungen/CEZusammenfassung.pdf b/GIT/CE/Zusammenfassungen/CEZusammenfassung.pdf
similarity index 100%
rename from ws2012/CE/Zusammenfassungen/CEZusammenfassung.pdf
rename to GIT/CE/Zusammenfassungen/CEZusammenfassung.pdf
diff --git a/ws2012/CE/Zusammenfassungen/EiCE-Zusammenfassung.pdf b/GIT/CE/Zusammenfassungen/EiCE-Zusammenfassung.pdf
similarity index 100%
rename from ws2012/CE/Zusammenfassungen/EiCE-Zusammenfassung.pdf
rename to GIT/CE/Zusammenfassungen/EiCE-Zusammenfassung.pdf
diff --git a/ws2012/CE/Zusammenfassungen/ce1_klausur-vorbereitung.pdf b/GIT/CE/Zusammenfassungen/ce1_klausur-vorbereitung.pdf
similarity index 100%
rename from ws2012/CE/Zusammenfassungen/ce1_klausur-vorbereitung.pdf
rename to GIT/CE/Zusammenfassungen/ce1_klausur-vorbereitung.pdf
diff --git a/ws2012/CE/infos.rtf b/GIT/CE/infos.rtf
similarity index 100%
rename from ws2012/CE/infos.rtf
rename to GIT/CE/infos.rtf
diff --git a/ws2012/CE/uebungen/EiCE_Uebung_00b.pdf b/GIT/CE/uebungen/EiCE_Uebung_00b.pdf
similarity index 100%
rename from ws2012/CE/uebungen/EiCE_Uebung_00b.pdf
rename to GIT/CE/uebungen/EiCE_Uebung_00b.pdf
diff --git a/ws2012/Hiwi TK/JSON-Format/json_testen.txt b/GIT/Hiwi TK/JSON-Format/json_testen.txt
similarity index 100%
rename from ws2012/Hiwi TK/JSON-Format/json_testen.txt
rename to GIT/Hiwi TK/JSON-Format/json_testen.txt
diff --git a/ws2012/Hiwi TK/JSON-Format/new json.pdf b/GIT/Hiwi TK/JSON-Format/new json.pdf
similarity index 100%
rename from ws2012/Hiwi TK/JSON-Format/new json.pdf
rename to GIT/Hiwi TK/JSON-Format/new json.pdf
diff --git a/ws2012/Hiwi TK/JSON-Format/new json.txt b/GIT/Hiwi TK/JSON-Format/new json.txt
similarity index 100%
rename from ws2012/Hiwi TK/JSON-Format/new json.txt
rename to GIT/Hiwi TK/JSON-Format/new json.txt
diff --git a/ws2012/Hiwi TK/Noisemap 2x API Calls.pdf b/GIT/Hiwi TK/Noisemap 2x API Calls.pdf
similarity index 100%
rename from ws2012/Hiwi TK/Noisemap 2x API Calls.pdf
rename to GIT/Hiwi TK/Noisemap 2x API Calls.pdf
diff --git a/ws2012/Hiwi TK/Notizen Treffen Immanuel/2012_10_01.rtf b/GIT/Hiwi TK/Notizen Treffen Immanuel/2012_10_01.rtf
similarity index 100%
rename from ws2012/Hiwi TK/Notizen Treffen Immanuel/2012_10_01.rtf
rename to GIT/Hiwi TK/Notizen Treffen Immanuel/2012_10_01.rtf
diff --git a/ws2012/Hiwi TK/Notizen Treffen Immanuel/2012_10_15.rtf b/GIT/Hiwi TK/Notizen Treffen Immanuel/2012_10_15.rtf
similarity index 100%
rename from ws2012/Hiwi TK/Notizen Treffen Immanuel/2012_10_15.rtf
rename to GIT/Hiwi TK/Notizen Treffen Immanuel/2012_10_15.rtf
diff --git a/ws2012/Hiwi TK/dankeskarteChef1.jpg b/GIT/Hiwi TK/dankeskarteChef1.jpg
similarity index 100%
rename from ws2012/Hiwi TK/dankeskarteChef1.jpg
rename to GIT/Hiwi TK/dankeskarteChef1.jpg
diff --git a/ws2012/Hiwi TK/dankeskarteChef2.jpg b/GIT/Hiwi TK/dankeskarteChef2.jpg
similarity index 100%
rename from ws2012/Hiwi TK/dankeskarteChef2.jpg
rename to GIT/Hiwi TK/dankeskarteChef2.jpg
diff --git a/ws2012/P2P/Folien/Lecture_1-1.pdf b/GIT/P2P/Folien/Lecture_1-1.pdf
similarity index 100%
rename from ws2012/P2P/Folien/Lecture_1-1.pdf
rename to GIT/P2P/Folien/Lecture_1-1.pdf
diff --git a/ws2012/P2P/uebungen/1/H1_1.graphml b/GIT/P2P/uebungen/1/H1_1.graphml
similarity index 100%
rename from ws2012/P2P/uebungen/1/H1_1.graphml
rename to GIT/P2P/uebungen/1/H1_1.graphml
diff --git a/ws2012/P2P/uebungen/1/H1_1.jpg b/GIT/P2P/uebungen/1/H1_1.jpg
similarity index 100%
rename from ws2012/P2P/uebungen/1/H1_1.jpg
rename to GIT/P2P/uebungen/1/H1_1.jpg
diff --git a/ws2012/P2P/uebungen/1/H1_3.graphml b/GIT/P2P/uebungen/1/H1_3.graphml
similarity index 100%
rename from ws2012/P2P/uebungen/1/H1_3.graphml
rename to GIT/P2P/uebungen/1/H1_3.graphml
diff --git a/ws2012/P2P/uebungen/1/H1_3.jpg b/GIT/P2P/uebungen/1/H1_3.jpg
similarity index 100%
rename from ws2012/P2P/uebungen/1/H1_3.jpg
rename to GIT/P2P/uebungen/1/H1_3.jpg
diff --git a/ws2012/P2P/uebungen/1/exercise1.pdf b/GIT/P2P/uebungen/1/exercise1.pdf
similarity index 100%
rename from ws2012/P2P/uebungen/1/exercise1.pdf
rename to GIT/P2P/uebungen/1/exercise1.pdf
diff --git a/ws2012/P2P/uebungen/1/exercise1_solution.odt b/GIT/P2P/uebungen/1/exercise1_solution.odt
similarity index 100%
rename from ws2012/P2P/uebungen/1/exercise1_solution.odt
rename to GIT/P2P/uebungen/1/exercise1_solution.odt
diff --git a/ws2012/P2P/uebungen/1/exercise1_solution.pdf b/GIT/P2P/uebungen/1/exercise1_solution.pdf
similarity index 100%
rename from ws2012/P2P/uebungen/1/exercise1_solution.pdf
rename to GIT/P2P/uebungen/1/exercise1_solution.pdf
diff --git a/ws2012/P2P/uebungen/1/u1.txt b/GIT/P2P/uebungen/1/u1.txt
similarity index 100%
rename from ws2012/P2P/uebungen/1/u1.txt
rename to GIT/P2P/uebungen/1/u1.txt
diff --git a/ws2012/Stundenplan WS12-13.pdf b/GIT/Stundenplan WS12-13.pdf
similarity index 100%
rename from ws2012/Stundenplan WS12-13.pdf
rename to GIT/Stundenplan WS12-13.pdf