diff options
| author | krebs <krebs@UTART> | 2011-05-22 01:40:26 +0200 |
|---|---|---|
| committer | krebs <krebs@UTART> | 2011-05-22 01:40:26 +0200 |
| commit | 0ec6ff898460d767cf984d792949ba7344e0758b (patch) | |
| tree | 9396a6e6dfc2bc55ca1651cdba55b7f0433a81f0 | |
| parent | a780c084808b707cd220729eea851b896c3310dc (diff) | |
| parent | 20a011072a4fa4f93589f4decdf96e47ad332b44 (diff) | |
Merge branch 'master' of github.com:krebscode/painload
Conflicts:
Makefile - moved noise make to seperated path
| -rw-r--r-- | Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -7,10 +7,13 @@ all: select-target infest: infest/etc infest/root - make -C modules/noise infest + install-debian: [ `which git` ] || apt-get install git-core [ `which tmux` ] || apt-get install tmux [ `which screen` ] && apt-get remote screen [ `which vim` ] || apt-get install vim +noise: + make -C modules/noise infest + |