Resolved merge conflicts for integration of mitchell's code.
authorNigel Kilmer <kiwisauce@kiwisauce.com>
Tue, 28 Feb 2012 06:29:15 +0000 (22:29 -0800)
committerNigel Kilmer <kiwisauce@kiwisauce.com>
Tue, 28 Feb 2012 06:29:15 +0000 (22:29 -0800)
commita6c3dfe0f525d133cd88267ddd73459138138428
treef1d30b04692979031730e2a72520a0f56b545bd5
parentaff5eb8a59fe38194f6dc000492952c15327cad4
parentef89e284541e8697483fd35222649339393975f9
Resolved merge conflicts for integration of mitchell's code.
game.c
thing.c