diff options
| author | Momo <momorientes@online.de> | 2011-09-01 12:17:21 +0200 |
|---|---|---|
| committer | Momo <momorientes@online.de> | 2011-09-01 12:17:21 +0200 |
| commit | ff0030cd7fe92a09173c16bf7b483cde638dab46 (patch) | |
| tree | 33c1cd58756ea023eb304a1504b3a079a7eae63a | |
| parent | 77d4efad2e89fe9357b10b1bd173fbded82468fe (diff) | |
| parent | abf8674a3fc02f172768be911c6e719290bf6bd5 (diff) | |
Merge branch 'master' of https://github.com/krebscode/painload
126 files changed, 862 insertions, 68060 deletions
@@ -3,6 +3,7 @@ a.out *.o *.a .svn/ +/god/Reaktor/tmp/ /bin/ /node/src /node/out diff --git a/.gitmodules b/.gitmodules index ab38c084..3677b710 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,6 +13,6 @@ [submodule "submodules/github/tautologistics/node-htmlparser"] path = submodules/github/tautologistics/node-htmlparser url = https://github.com/tautologistics/node-htmlparser -[submodule "krebsbeam/c-beam"] - path = krebsbeam/c-beam - url = git://dev.c-base.org/c-beam/c-beam.git +[submodule "submodules/github/makefu/dpfhack_display"] + path = submodules/github/makefu/dpfhack_display + url = https://github.com/makefu/dpfhack_pearl diff --git a/Refactory/Makefile b/Refactory/Makefile new file mode 100644 index 00000000..57b983df --- /dev/null +++ b/Refactory/Makefile @@ -0,0 +1,2 @@ +install: + ln -snf $$PWD/bin/git-clone-into ../bin/ 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 |