summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * 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
| |\ \ \ | | |/ / | |/| |
| * | | cholerab README: add conflictstv2011-08-061-0/+9
| * | | Merge remote-tracking branch '52e446de-9909-430a-becf-0c1b94e08fc6/4b74cb04-c...tv2011-08-0625-0/+723
| |\ \ \
| * \ \ \ Merge branch 'master' of github.com:krebscode/painloadtv2011-08-062-2/+7
| |\ \ \ \
| * | | | | assimilator: add git-clone-intotv2011-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
* | | | | | Merge branch 'master' of github.com:/krebscode/painloadroot2011-08-061-18/+37
|\ \ \ \ \ \
| * \ \ \ \ \ emergency mergemakefu2011-08-0636-15/+836
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | refactored arping_users, needs some workingmakefu2011-08-061-21/+40
* | | | | | | 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
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | Changed the outputMomo2011-08-051-1/+1
| * | | | | Added Kachelman to return the current weather situationMomo2011-08-051-0/+6
* | | | | | cholerab README: add conflictstv2011-08-061-0/+9
* | | | | | Merge remote-tracking branch '52e446de-9909-430a-becf-0c1b94e08fc6/4b74cb04-c...tv2011-08-0625-0/+723
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge pull request #1 from momorientes/masterFelix Richter2011-08-043-0/+163
| |\ \ \ \ \
| | * | | | | Added the Krebs svg with and without the 42::/16 sub. Also addedMomo2011-08-043-0/+163
| |/ / / / /
| * | | | | bling filter: the better krebs viewertv2011-08-041-0/+3
| * | | | | Merge branch 'master' of github.com:/krebscode/cholerabtv2011-08-041-5/+6
| |\ \ \ \ \
| | * | | | | Describe eon hardertv2011-08-041-2/+3
| | * | | | | add newest and best eroot version evertv2011-08-041-3/+3
| * | | | | | krebs-v2f.txt: the s/ /&&/g version of v2tv2011-08-041-0/+13
| |/ / / / /
| * | | | | manifest: initial committv2011-08-031-0/+4
| * | | | | Momo -= XXLtv2011-07-281-1/+1