summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/krebscode/painloadroot2011-08-101-0/+31
|\
| * AGENDA.cccamp11: add more details [good vs. evil]tv2011-08-101-0/+31
| |
* | filebitch/connect_narf: s/morse/beep/root2011-08-101-4/+4
|/
* Merge branch 'master' of github.com:krebscode/painloadtv2011-08-0915-26/+74
|\
| * Fixed changes and dumped the caching :)Momo2011-08-091-21/+14
| |
| * initial commitMomo2011-08-094-0/+41
| |
| * Merge branch 'master' of github.com:krebscode/painloadmakefu2011-08-093-2/+68
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: census/* : hard renaming of people to census people/* : deleted old people folder retiolum/Makefile : added retiolum Makefile retiolum/scripts/adv_graphgen/sanitize.sh: merged sanitize script
| * | retiolum/scripts/adv_graphgen: verb krebs outputmakefu2011-08-082-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | retiolum/scripts/adv_graphgen/parse.py: add the group info to the krebs parser retiolum/scripts/adv_graphgen/sanitize.sh: fixed bug which prevents generation of 4 graph new graph setter at retiolum_4.png
| * | retiolum/Makefile: add help command for default make targetmakefu2011-08-081-2/+15
| | |
| * | initial vomitroot2011-08-071-0/+36
| | |
| * | Merge branch 'master' of github.com:/krebscode/painloadroot2011-08-072-4/+4
| |\ \
| | * \ Merge branch 'master' of github.com:krebscode/painloadmakefu2011-08-0728-13/+68
| | |\ \
| | | * | kachelmann: remove need for tempfilemakefu2011-08-071-4/+3
| | | | | | | | | | | | | | | | | | | | TODO: the Makefile needs to be fixed though
| | * | | stream/stream.db: added local icecast to listmakefu2011-08-071-0/+1
| | | | | | | | | | | | | | | | | | | | krebs now has icecast installed, added entry to stream.db
| * | | | icecrab/*: new module icecrab, icecast for krebsroot2011-08-073-0/+199
| | | | | | | | | | | | | | | | | | | | Contains a makefile which installs icecast and configures it accordingly
| * | | | streams/streams: add infinite loop to commandroot2011-08-071-1/+1
| | |/ / | |/| |
| * | | util/bin/galileo: compliance to changed tts-behaviormakefu2011-08-061-1/+2
| | | |
| * | | fixed my idiocyMomo2011-08-061-1/+1
| | | |
| * | | Added .gitignoreMomo2011-08-061-0/+2
| | | |
| * | | Deleted deprecated stuffMomo2011-08-061-7/+0
| | | |
| * | | Merge branch 'master' of https://github.com/krebscode/painloadMomo2011-08-064-0/+15
| |\ \ \
| | * | | COPYING: import the WTFPL version 2tv2011-08-061-0/+14
| | | | |
| | * | | gitignore a.outtv2011-08-061-0/+1
| | | | |
| | * | | Merge branch 'master' of github.com:krebscode/painloadtv2011-08-060-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Refactory/bin/git-clone-into assimilator/bin/git-clone-into refactory/bin/git-clone-into
| | * | | | ${btc-stuff} -> btc/tv2011-08-0617-262/+0
| | | | | |
| | * | | | Merge branch 'master' of github.com:krebscode/painloadtv2011-08-0617-0/+262
| | |\ \ \ \
| | | * | | | assimilator: and it's gonetv2011-08-061-48/+0
| | | | | | |
| | | * | | | Merge branch 'master' of github.com:krebscode/painloadtv2011-08-061-0/+48
| | | |\ \ \ \
| | | | * | | | git-eternal-move: $2 is interpreted as dirtv2011-08-061-1/+2
| | | | | | | |
| | | | * | | | git-eternal-move: check $#tv2011-08-061-2/+5
| | | | | | | |
| | | | * | | | git-eternal-move: add to wrong locationtv2011-08-061-0/+11
| | | | | | | |
| | | * | | | | git-eternal-move: $2 is interpreted as dirtv2011-08-061-1/+2
| | | | | | | |
| | | * | | | | git-eternal-move: check $#tv2011-08-061-2/+5
| | | | | | | |
| | | * | | | | git-eternal-move: add to wrong locationtv2011-08-061-0/+11
| | | | | | | |
| | | * | | | | Merge branch 'master' of github.com:/krebscode/painloadroot2011-08-061-18/+37
| | | |\ \ \ \ \
| | | | * \ \ \ \ emergency mergemakefu2011-08-0636-15/+836
| | | | |\ \ \ \ \
| | | * | | | | | | beep.lol: final commitroot2011-08-061-1/+0
| | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Merge branch 'master' of github.com:krebscode/painloadtv2011-08-062-3/+5
| | | |\ \ \ \ \ \
| | | | * | | | | | Edited the output so espeak can pronounce itroot2011-08-061-1/+1
| | | | | | | | | |
| | | | * | | | | | Merge branch 'master' of github.com:/krebscode/painloadroot2011-08-060-0/+0
| | | | |\ \ \ \ \ \
| | | | * | | | | | | Made kachelmann speak germanroot2011-08-061-1/+1
| | | | | | | | | | |
| | | | * | | | | | | Mde the Makefile to rename conditions to kachelmann in /root/binroot2011-08-061-1/+3
| | | | | | | | | | |
| | | * | | | | | | | infest skel motd: use krebs-v2ftv2011-08-061-9/+13
| | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Merge branch 'master' of github.com:krebscode/painloadtv2011-08-063-3/+10
| | | |\| | | | | |
| | | | * | | | | | Fixed the Makefile and renamed conditions.pl to conditionsroot2011-08-063-3/+10
| | | | | | | | | |
| | | * | | | | | | Merge remote-tracking branch 'momo/master'tv2011-08-060-0/+0
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: kachelmann/conditions.pl
| | | * | | | | | | cholerab README: add conflictstv2011-08-061-0/+9
| | | | | | | | | |
| | | * | | | | | | Merge remote-tracking branch ↵tv2011-08-0625-0/+723
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '52e446de-9909-430a-becf-0c1b94e08fc6/4b74cb04-c218-4cbd-8cd7-e73623ef87f6'
| | | * \ \ \ \ \ \ \ Merge branch 'master' of github.com:krebscode/painloadtv2011-08-062-2/+7
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | assimilator: add git-clone-intotv2011-08-061-0/+48
| | | | | | | | | | | |