summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | | | 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
| | | | | | | | | | | |
| | * | | | | | | | | | 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
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Added changes to Kachelmann so he can notify you when the weatherMomo2011-08-062-0/+31
| | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes
| * | | | | | | | | | | | | | ${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
| | | | |_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge branch 'master' of github.com:/krebscode/painloadroot2011-08-061-18/+37
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | | emergency mergemakefu2011-08-0636-15/+836
| | | | |\ \