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 | 21cf2eae73ea4ae2a63df512767480584073d232 (patch) | |
| tree | 2adc7b1e9f7c067b43ecef7bb7bb00985136eb86 /people/mac_names.lst | |
| parent | 8efab77bc711f12db0ea8fabed469680acaac472 (diff) | |
| parent | 27636a7d483a2030ba9fae77e9fbe5d03763009b (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.lst | 6 |
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 |