Commit Graph

2148 Commits

Author SHA1 Message Date
Neale Pickett c4e6a49291 remove armadillo category 2011-09-23 16:05:17 -06:00
Neale Pickett b1d25138fe remove armadillo category 2011-09-23 16:05:17 -06:00
Neale Pickett 1d8de3651f remove armadillo category 2011-09-23 16:05:17 -06:00
Neale Pickett eeb583b5fb IPv6 for ircd, mcp 2011-09-23 16:04:25 -06:00
Neale Pickett 0753b78b94 IPv6 for ircd, mcp 2011-09-23 16:04:25 -06:00
Neale Pickett 729ecf7393 IPv6 for ircd, mcp 2011-09-23 16:04:25 -06:00
Neale Pickett 607034b2e3 IPv6 for ircd, mcp 2011-09-23 16:04:25 -06:00
Neale Pickett 79b6534204 resolve packages passwd conflicts 2011-09-23 13:42:02 -06:00
Neale Pickett 1303ae6a5b resolve packages passwd conflicts 2011-09-23 13:42:02 -06:00
Neale Pickett 79caa65faf resolve packages passwd conflicts 2011-09-23 13:42:02 -06:00
Neale Pickett 7a4c78e24e resolve packages passwd conflicts 2011-09-23 13:42:02 -06:00
Neale Pickett 7f80a15a42 Document IPv6 layout 2011-09-23 09:11:20 -06:00
Neale Pickett 114172035c Document IPv6 layout 2011-09-23 09:11:20 -06:00
Neale Pickett 74d3b3d49e Document IPv6 layout 2011-09-23 09:11:20 -06:00
Neale Pickett 90e9142abf Document IPv6 layout 2011-09-23 09:11:20 -06:00
Neale Pickett da7a8b2f6b remove dnsmasq from router package 2011-09-22 18:41:28 -06:00
Neale Pickett 95dd33d1b8 remove dnsmasq from router package 2011-09-22 18:41:28 -06:00
Neale Pickett 5b3aac001b remove dnsmasq from router package 2011-09-22 18:41:28 -06:00
Neale Pickett 4ce9f011c5 remove dnsmasq from router package 2011-09-22 18:41:28 -06:00
Neale Pickett 17d0544c1e IPv6 router 2011-09-22 18:32:03 -06:00
Neale Pickett 70d4f4d27c IPv6 router 2011-09-22 18:32:03 -06:00
Neale Pickett 9ceebc2a6e IPv6 router 2011-09-22 18:32:03 -06:00
Neale Pickett d1fcadc838 IPv6 router 2011-09-22 18:32:03 -06:00
Neale Pickett 103688df85 fix arc4 definition 2011-09-21 17:31:13 -06:00
Neale Pickett 71a8f95f68 fix arc4 definition 2011-09-21 17:31:13 -06:00
Neale Pickett c1512ce6a2 fix arc4 definition 2011-09-21 17:31:13 -06:00
Neale Pickett 61eee6c826 fix arc4 definition 2011-09-21 17:31:13 -06:00
Neale Pickett ae37e47966 Merge remote-tracking branch 'origin/p2'
Conflicts:
	packages/bletchley/300/index.mdwn
	packages/sequence/400/key
2011-09-21 17:04:34 -06:00
Neale Pickett 61285070a8 Merge remote-tracking branch 'origin/p2'
Conflicts:
	packages/bletchley/300/index.mdwn
	packages/sequence/400/key
2011-09-21 17:04:34 -06:00
Neale Pickett 13b1de268e Merge remote-tracking branch 'origin/p2'
Conflicts:
	packages/bletchley/300/index.mdwn
	packages/sequence/400/key
2011-09-21 17:04:34 -06:00
Neale Pickett 35014c7642 Merge remote-tracking branch 'origin/p2'
Conflicts:
	packages/bletchley/300/index.mdwn
	packages/sequence/400/key
2011-09-21 17:04:34 -06:00
Neale Pickett 01a041c013 Merge remote-tracking branch 'origin/inferno' 2011-09-21 17:03:26 -06:00
Neale Pickett af6544ceaa Merge remote-tracking branch 'origin/inferno' 2011-09-21 17:03:26 -06:00
Neale Pickett 4c84013c4c Merge remote-tracking branch 'origin/inferno' 2011-09-21 17:03:26 -06:00
Neale Pickett cd80261e5d Merge remote-tracking branch 'origin/inferno' 2011-09-21 17:03:26 -06:00
Neale Pickett 64b2316860 octopus port to ipv6 2011-09-21 16:19:00 -06:00
Neale Pickett 0f709df383 octopus port to ipv6 2011-09-21 16:19:00 -06:00
Neale Pickett 7337fea1e1 octopus port to ipv6 2011-09-21 16:19:00 -06:00
Neale Pickett a82fbfe7ba octopus port to ipv6 2011-09-21 16:19:00 -06:00
Neale Pickett 5c870b3c6f fixes for new buildroot + cleanup from merge 2011-09-21 15:23:09 -06:00
Neale Pickett d5976d4a2e fixes for new buildroot + cleanup from merge 2011-09-21 15:23:09 -06:00
Neale Pickett 2031016d46 fixes for new buildroot + cleanup from merge 2011-09-21 15:23:09 -06:00
Neale Pickett cfb7728a46 fixes for new buildroot + cleanup from merge 2011-09-21 15:23:09 -06:00
Neale Pickett bdc64d547c Merge remote branch 'fozzie/master'
Conflicts:
	packages/ctfbase/service/ctfd/run
2011-09-20 09:21:49 -06:00
Neale Pickett 24ea578807 Merge remote branch 'fozzie/master'
Conflicts:
	packages/ctfbase/service/ctfd/run
2011-09-20 09:21:49 -06:00
Neale Pickett 6a878e5c2c Merge remote branch 'fozzie/master'
Conflicts:
	packages/ctfbase/service/ctfd/run
2011-09-20 09:21:49 -06:00
Neale Pickett 9231deff32 Merge remote branch 'fozzie/master'
Conflicts:
	packages/ctfbase/service/ctfd/run
2011-09-20 09:21:49 -06:00
Neale Pickett 6ba995ae2b create passwd file in ctf package 2011-09-20 09:21:11 -06:00
Neale Pickett 774d90c7bd create passwd file in ctf package 2011-09-20 09:21:11 -06:00
Neale Pickett 709a0e3c90 modify a few things 2011-09-16 10:08:07 -06:00