diff options
author | makefu <makefu@syntax-fehler.de> | 2011-06-30 23:33:03 +0200 |
---|---|---|
committer | makefu <makefu@syntax-fehler.de> | 2011-06-30 23:33:03 +0200 |
commit | 2906365c87b8a01f4731823ac400dee8d1ea62c1 (patch) | |
tree | 031c5a91af88f9c128fa8de894e3ff5a3c01ca25 /zoneminder/Makefile | |
parent | 442ea17860359fa120c4451ea7f0dbacf5ec97c6 (diff) | |
parent | 07f4cbf46f0872097ecf03435dfbacc2531ca7e2 (diff) |
Merge branch 'master' of github.com:krebscode/painload
Conflicts:
mining/Makefile: now installs tmux and configures
Diffstat (limited to 'zoneminder/Makefile')
0 files changed, 0 insertions, 0 deletions