diff options
| author | makefu <github@syntax-fehler.de> | 2011-09-12 14:32:18 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2011-09-12 14:32:18 +0200 |
| commit | 9f70f9b5b462aa3e150b9708f695edfaf716edd4 (patch) | |
| tree | 5cbebe6cbc0ada2c988d7f14d0bbbc52a68b37c1 | |
| parent | 568fbd7fa5541182bbbc33560863ec9c3ff01d48 (diff) | |
| parent | a07326f6c57a7e8f49b9bef96ded427275a16e2e (diff) | |
Merge branch 'master' into punani_files
134 files changed, 2943 insertions, 260 deletions
@@ -1,10 +1,24 @@ + +# Linux kernel module +modules.order +Module.symvers +.built-in.o.cmd +*.ko.cmd +*.o.cmd +.tmp_versions/ +*.ko +*.mod.c + a.out *.pyc *.o *.a .svn/ +/god/Reaktor/tmp/ /bin/ /node/src /node/out /ovh/soapi/src /ovh/soapi/SOAPpy +/Reaktor/IRC/irclib.py +/Reaktor/public_commands/* diff --git a/.gitmodules b/.gitmodules index cbc61522..3677b710 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,9 +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-bea |