summaryrefslogtreecommitdiffstats
path: root/cholerab
diff options
context:
space:
mode:
Diffstat (limited to 'cholerab')
-rw-r--r--cholerab/AGENDA (renamed from cholerab/AGENDA.cccamp11)12
-rw-r--r--cholerab/cockbook/git/remove-submodule5
-rw-r--r--cholerab/shirts/bestellliste2
3 files changed, 16 insertions, 3 deletions
diff --git a/cholerab/AGENDA.cccamp11 b/cholerab/AGENDA
index 7bdf02a3..8c80be0d 100644
--- a/cholerab/AGENDA.cccamp11
+++ b/cholerab/AGENDA
@@ -16,8 +16,6 @@
- make-based installer for voice-symlinks
- ttycnser
- - server component
- - JSON-RPC [spec and implementation]
- client component
- ttycnser (makefu)
DONE - Python Notification (makefu)
@@ -99,3 +97,13 @@
- cping, cpong
- recursiv make
+
+ - exedirs
+
+ - //-integration
+ - libc?
+ - sh?
+
+ - //Schnabeltasse
+
+ - wgrep
diff --git a/cholerab/cockbook/git/remove-submodule b/cholerab/cockbook/git/remove-submodule
new file mode 100644
index 00000000..da8a1b00
--- /dev/null
+++ b/cholerab/cockbook/git/remove-submodule
@@ -0,0 +1,5 @@
+Delete the relevant line from the .gitmodules file.
+Delete the relevant section from .git/config.
+Run git rm --cached path_to_submodule (no trailing slash).
+Commit and delete the now untracked submodule files.
+
diff --git a/cholerab/shirts/bestellliste b/cholerab/shirts/bestellliste
index cfb28888..2c94ffe9 100644
--- a/cholerab/shirts/bestellliste
+++ b/cholerab/shirts/bestellliste
@@ -1,5 +1,5 @@
# S G∃ Feedback
-tv 2 M j-
+tv 2 M jj Superdick aufgetragenes Gummifetisch Logo; Farbe: genial
1 S j-
ulrich 1 M ?j gut
felix 2 M jj super qualitaet, sogar nach dem waschen kein bisschen ausgebleicht