summaryrefslogtreecommitdiffstats
path: root/people/mac_names.lst
diff options
context:
space:
mode:
authormakefu <makefu@syntax-fehler.de>2011-06-30 23:33:03 +0200
committermakefu <makefu@syntax-fehler.de>2011-06-30 23:33:03 +0200
commitff29991315b26216a69a9c362747913f3b0482dc (patch)
tree746086cb1c65e19f3185e2771720518a033a43ef /people/mac_names.lst
parent4501bdfbc96b500b9ab6675c4a6674f4e77da52b (diff)
parentdf04c27a35814c115690b96b94368ec08e54f796 (diff)
Merge branch 'master' of github.com:krebscode/painload
Conflicts: mining/Makefile: now installs tmux and configures
Diffstat (limited to 'people/mac_names.lst')
-rw-r--r--people/mac_names.lst6
1 files changed, 6 insertions, 0 deletions
diff --git a/people/mac_names.lst b/people/mac_names.lst
index dcd3c2b0..ae58b539 100644
--- a/people/mac_names.lst
+++ b/people/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