commit | c6cbbb7fc4e68218bc87de0867c97c7e4aa3131c | [log] [tgz] |
---|---|---|
author | Daniel Petti <djpetti@me.com> | Thu Nov 07 03:04:33 2013 +0000 |
committer | Daniel Petti <djpetti@me.com> | Thu Nov 07 03:04:33 2013 +0000 |
tree | 9f5dee243c8250b36426e150fea75f4c1b0c5e9d | |
parent | c6e35da31a550c34e840edbb438700fa49276d49 [diff] |
Fix some post-merge stuff. - The merge somewhat garbled a couple files, just got it to build again. The shooter now passes all its tests.