diff options
| author | root <root@krebs> | 2011-09-01 02:18:42 +0200 |
|---|---|---|
| committer | root <root@krebs> | 2011-09-01 02:18:42 +0200 |
| commit | bb2a234ba756eb600fb6f562e67500d511d4ab39 (patch) | |
| tree | c89b205e3ad2d20e3aa80ca525e0bbf1e01b4670 | |
| parent | 8a6fd84c70618f5a435d2859b513de6de68dc0d1 (diff) | |
| parent | 4fb37da707279faf92cc8a054c646336f23dfdbe (diff) | |
Merge branch 'master' of github.com:/krebscode/painload
Conflicts:
.gitmodules
oncology/dpfhack_display
126 files changed, 850 insertions, 68057 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..cbc61522 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,6 @@ [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/knut/clients/cnot/index b/cholerab/knut/clients/cnot/index index f276dd25..fcbef73e 100755 --- a/cholerab/knut/clients/cnot/index +++ b/cholerab/knut/clients/cnot/index @@ -11,7 +11,7 @@ port=42101 params="$*" -flags=-sS +flags=${curl_flags--fsS} if test "${verbose-no}" != no; then flags="${flags+$flags }-v" diff --git a/cholerab/knut/index.js b/cholerab/knut/index.js in |