{"head":"727c40c0d9f2c296a0b1545ed718c82b5550d63a","size":4,"push_id":44235261,"shas":[["6f350bc68c6211f9002497b68c06a0ea4f384e8a","702f9b3dd91b545ff69940b089127e13d1b40fb2@gmail.com","Tool use bug fixed.  May have introduced new bugs; be vigilant.","Whales"],["07a8cfb93adf9f73a34b847a5a781e9d6cf7df9d","702f9b3dd91b545ff69940b089127e13d1b40fb2@gmail.com","Fixed bug that precluded the use of gun mods","Whales"],["2830d55377f9c6e8d7460c5ee491f9759d70fc38","702f9b3dd91b545ff69940b089127e13d1b40fb2@gmail.com","Fixed sewing kit segfault","Whales"],["727c40c0d9f2c296a0b1545ed718c82b5550d63a","ffdbb9b3e44ad3b4fb55cd4d180791e48901f2b7@yahoo.com","Merge remote-tracking branch 'upstream/master'\n\nConflicts:\n\tLAB_NOTES\n\tNAMES_FEMALE\n\tNAMES_LAST\n\tNAMES_MALE\n\tNPC_HINTS\n\tbin/Debug/data/LAB_NOTES\n\tbin/Debug/data/NAMES_FEMALE\n\tbin/Debug/data/NAMES_LAST\n\tbin/Debug/data/NAMES_MALE\n\tbin/Debug/data/NPC_HINTS\n\tcolor.h\n\tconstruction.cpp\n\tcrafting.cpp\n\tdata/LAB_NOTES\n\tdata/NAMES_FEMALE\n\tdata/NAMES_LAST\n\tdata/NAMES_MALE\n\tdata/NPC_HINTS\n\tgame.cpp\n\thelp.cpp\n\tinventory.cpp\n\titype.h\n\titypedef.cpp\n\tiuse.cpp\n\tmain.cpp\n\tmapdata.h\n\tnewcharacter.cpp\n\tnpc.cpp\n\tovermap.cpp\n\tplayer.cpp\n\tpldata.h\n\tranged.cpp","Mark Goldberg"]],"ref":"refs/heads/master"}