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 /census/mac_names.lst | |
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 'census/mac_names.lst')
-rw-r--r-- | census/mac_names.lst | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/census/mac_names.lst b/census/mac_names.lst index dcd3c2b0..ae58b539 100644 --- a/census/mac_names.lst +++ b/census/mac_names.lst @@ -1 +1,7 @@ 00:40:63:c8:b5:a0 krebs +00:23:54:29:1d:3e hadez +00:26:c7:bd:a7:1a Martin +04:1e:64:05:39:28 Stephan +5c:59:48:22:2d:d2 Phil +00:21:00:fb:5c:b6 Kah Hah +00:1e:64:27:3b:72 Felix |