{"shas":[["5e7faf83767998973eb871ca48574352f96b50af","476f675636c71b2e05ef2e6d2dd7cc4598b8c338@gmail.com","Fix for that fix for my fix.","Darryl Pogue"],["0e66f1651d626e6638a8938abf6b1604248c929d","96835dd8bfa718bd6447ccc87af89ae1675daeca@tnightingale.com","Merge branch 'master' of https://github.com/dvpdiner2/td into dvpdiner2-master","Tom Nightingale"],["de95dbba06e832b6151fa1f326e2d302a62aa6c9","476f675636c71b2e05ef2e6d2dd7cc4598b8c338@gmail.com","Gonna call this map stuff fixed (finally).","Darryl Pogue"],["f7e6bb10a32e1151d343522c6d184915847d69ac","55b9dd728d103fbaccfc1f791a25f56ae7628fd7@hotmail.com","bug fix will add resources to player correctly","Warren Voelkl"],["549b09b2f190090f99139695c39ab96bbb73556e","96835dd8bfa718bd6447ccc87af89ae1675daeca@tnightingale.com","Merge branch 'master' of https://github.com/dvpdiner2/td into dvpdiner2-master","Tom Nightingale"],["21656311c0a0a34a5039db09c32d285eefc62137","55b9dd728d103fbaccfc1f791a25f56ae7628fd7@hotmail.com","removed warning","Warren Voelkl"],["fe7aad00fa765857aac73357ce2686d37837ac91","02ade7b706cf87a042a3a47624b43f41a50e7927@gmail.com","Merge remote-tracking branch 'upstream/master'","Marcel Vangrootheest"],["aadcd71749e7c7c8be0d0ec6468cd4ca45edebbc","02ade7b706cf87a042a3a47624b43f41a50e7927@gmail.com","Merge branch 'master' of github.com:mvan/td","Marcel Vangrootheest"],["e6f8b9acf302e2d79eadb89727a7664be478ecac","ead338bf1ef16b39dc2885f40e1d500951f31e40@gmail.com","Merge branch 'master' of github.com:mvan/td\n\nConflicts:\n\tsrc/graphics/TowerGraphicsComponent.cpp\n\tsrc/graphics/TowerGraphicsComponent.h","Dean Morin"],["71828215dd23a7366e427bdaa0a59435723a1bd4","ead338bf1ef16b39dc2885f40e1d500951f31e40@gmail.com","Merge branch 'triangles'","Dean Morin"]],"repo":"mvan/td","actor":"deanmorin","ref":"refs/heads/triangles","size":10,"head":"71828215dd23a7366e427bdaa0a59435723a1bd4","actor_gravatar":"57f7462dc36d7e75ff168f7098feca11","push_id":29536762}