Commit Graph

1832 Commits

Author SHA1 Message Date
Neale Pickett 5203a2c45d Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf
Conflicts:
	packages/p2/bin/p2console
2012-12-18 10:16:42 -07:00
Neale Pickett 1f674c269b Some p2 changes 2012-12-18 10:15:08 -07:00
Neale Pickett 564b84c640 Some p2 changes 2012-12-18 10:15:08 -07:00
Neale Pickett a79c87648d Some p2 changes 2012-12-18 10:15:08 -07:00
Neale Pickett 6d21e999b2 Some p2 changes 2012-12-18 10:15:08 -07:00
Neale Pickett 05bf3df977 Make a poster 2012-12-17 16:27:35 -07:00
Neale Pickett 72c0b6caf6 Make a poster 2012-12-17 16:27:35 -07:00
Neale Pickett 92ee658289 Make a poster 2012-12-17 16:27:35 -07:00
Neale Pickett f2f8ccb895 Make a poster 2012-12-17 16:27:35 -07:00
Neale Pickett 2d6f6ecaaa Document netarch category 2012-11-14 17:56:06 -07:00
Neale Pickett 4689376e1c Document netarch category 2012-11-14 17:56:06 -07:00
Neale Pickett 2906954c56 Document netarch category 2012-11-14 17:56:06 -07:00
Neale Pickett c3efbbb0e5 Document netarch category 2012-11-14 17:56:06 -07:00
Neale Pickett fcb12e53e2 Possibly working directory auto-detection 2012-11-07 19:44:27 -07:00
Neale Pickett 6f3170ebfa Possibly working directory auto-detection 2012-11-07 19:44:27 -07:00
Neale Pickett 8d999c678f Possibly working directory auto-detection 2012-11-07 19:44:27 -07:00
Neale Pickett 91e946bc05 Possibly working directory auto-detection 2012-11-07 19:44:27 -07:00
Neale Pickett 1c5a3a8b53 make a stab at detecting fs layout 2012-10-31 16:01:36 -06:00
Neale Pickett 4c2931aec6 make a stab at detecting fs layout 2012-10-31 16:01:36 -06:00
Neale Pickett 472ddcdfea make a stab at detecting fs layout 2012-10-31 16:01:36 -06:00
Neale Pickett 44e41c48e5 make a stab at detecting fs layout 2012-10-31 16:01:36 -06:00
Neale Pickett 91dce4e90c Merge branch 'novar'
Conflicts:
	packages/p2/www/index.html
2012-08-16 19:48:06 -06:00
Neale Pickett 7e3c68f835 Merge branch 'novar'
Conflicts:
	packages/p2/www/index.html
2012-08-16 19:48:06 -06:00
Neale Pickett b7796dc10c Merge branch 'novar'
Conflicts:
	packages/p2/www/index.html
2012-08-16 19:48:06 -06:00
Neale Pickett 16a4a0b4d8 Merge branch 'novar'
Conflicts:
	packages/p2/www/index.html
2012-08-16 19:48:06 -06:00
Neale Pickett e12fdcd027 Fail startup of points if packages are not online yet 2012-08-16 19:47:19 -06:00
Neale Pickett d14c77f070 Fail startup of points if packages are not online yet 2012-08-16 19:47:19 -06:00
Neale Pickett 72c5f802bd Fail startup of points if packages are not online yet 2012-08-16 19:47:19 -06:00
Neale Pickett f95605f3e6 Fail startup of points if packages are not online yet 2012-08-16 19:47:19 -06:00
Neale Pickett c7252bebe3 puzzles.cgi from novar branch 2012-07-26 19:28:29 -06:00
Neale Pickett c5c7307c5c puzzles.cgi from novar branch 2012-07-26 19:28:29 -06:00
Neale Pickett d5d7fc8691 puzzles.cgi from novar branch 2012-07-26 19:28:29 -06:00
Neale Pickett 151648c6f2 puzzles.cgi from novar branch 2012-07-26 19:28:29 -06:00
Neale Pickett 19e46c9b34 add bus. card puzzle, mention radio on index 2012-07-26 19:25:36 -06:00
Neale Pickett 1603b791a8 add bus. card puzzle, mention radio on index 2012-07-26 19:25:36 -06:00
Neale Pickett d0ff2c2156 add bus. card puzzle, mention radio on index 2012-07-26 19:25:36 -06:00
Neale Pickett 8785008932 add bus. card puzzle, mention radio on index 2012-07-26 19:25:36 -06:00
Neale Pickett d29a0a058f Merge answers from novar for p2@dc20 2012-07-26 17:57:33 -06:00
Neale Pickett 729df67be4 Merge answers from novar for p2@dc20 2012-07-26 17:57:33 -06:00
Neale Pickett 84fe59d47a Merge answers from novar for p2@dc20 2012-07-26 17:57:33 -06:00
Neale Pickett c703ab3aa2 Merge answers from novar for p2@dc20 2012-07-26 17:57:33 -06:00
Neale Pickett db98d384ec make radio answers 2012-07-26 17:54:53 -06:00
Neale Pickett 04c37d19f1 make radio answers 2012-07-26 17:54:53 -06:00
Neale Pickett 8b85524ab6 make radio answers 2012-07-26 17:54:53 -06:00
Neale Pickett a73127840d make radio answers 2012-07-26 17:54:53 -06:00
Neale Pickett e9ea181fd0 Merge remote-tracking branch 'fozzie/master' into novar 2012-07-26 17:38:48 -06:00
Neale Pickett cd6216d4a8 Merge remote-tracking branch 'fozzie/master' into novar 2012-07-26 17:38:48 -06:00
Neale Pickett c5a7f97f0d Merge remote-tracking branch 'fozzie/master' into novar 2012-07-26 17:38:48 -06:00
Neale Pickett adb68f0b46 Merge remote-tracking branch 'fozzie/master' into novar 2012-07-26 17:38:48 -06:00
Neale Pickett 595810f444 nyancat part of DJ puzzle 2012-07-23 23:03:26 -06:00