{"shas":[["d5e0a3f796d0e6d0916ac42ecf755ab3f52d13e9","f12e5eb038cc02105a620d5c61e66c6650d51a5f@swganh.org","Merge branch 'data_layer' of github.com:anhstudios/swganh into data_layer\n\nConflicts:\n\tsrc/swganh/object/intangible/cell.h\n\tsrc/swganh/object/tangible.cc\n\tsrc/swganh/object/tangible.h\n\tsrc/swganh/object/waypoint.h","Kronos11"],["95a8637a42c70c0c86e881e8d61ccd899bdc0aa8","f12e5eb038cc02105a620d5c61e66c6650d51a5f@swganh.org","Some work on Weapon, and documentaiton on waypoint.","Kronos11"]],"ref":"refs/heads/data_layer","size":2,"head":"95a8637a42c70c0c86e881e8d61ccd899bdc0aa8","push_id":43110295}