Commit Graph

9 Commits

Author SHA1 Message Date
Neale Pickett 939514d9f7 Merge branch 'master' from laptop
Conflicts:

	doc/ideas.txt
	pwnables/service/sshd.pwn/run
2010-10-22 11:30:58 -06:00
Neale Pickett 4c4656ede0 A couple fixes made during NSM 2010-10-22 11:15:37 -06:00
Neale Pickett 5a2caae951 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2010-10-22 09:37:02 -06:00
Neale Pickett 637545aa9a Make puzzles first class categories 2010-10-21 22:15:18 -06:00
Neale Pickett ab18a9b4d6 Add OpenWRT VLAN config 2010-10-21 16:06:24 -06:00
Neale Pickett ea00976e68 Fix everything I found on Thursday 2010-10-09 23:52:33 -06:00
Neale Pickett 2532fe5e43 I think everything's working...
* Octopus changes
* Change how things start a little (hopefully cleaner)
* Fix bubblebabble bug
* other junk, I don't know
2010-09-29 17:38:54 -06:00
Neale Pickett e002f16618 Start trying to get token distribution working 2010-09-27 21:03:10 -06:00
Neale Pickett 48caa26556 Add in pwnables, start at octopus & tokencli 2010-09-26 21:54:31 -06:00