{"shas":[["639ce347fbf875a61b49fb995e1264b1d7ee1955","476f675636c71b2e05ef2e6d2dd7cc4598b8c338@gmail.com","Fixes for single player","Darryl Pogue"],["71db6439e876a6a135f7afb59bc29c3a2ec081ff","476f675636c71b2e05ef2e6d2dd7cc4598b8c338@gmail.com","Merge branch 'master' into lobby\n\nConflicts:\n\tsrc/audio/manager.cpp","Darryl Pogue"],["9f14713cff3cfc935d93909217fb20886d1d42d8","476f675636c71b2e05ef2e6d2dd7cc4598b8c338@gmail.com","Use defines.h and disable SP once connected to the lobby","Darryl Pogue"],["aaf069e7412c2311aedc1e345babc0da57a0f4c0","02ade7b706cf87a042a3a47624b43f41a50e7927@gmail.com","Merge remote-tracking branch 'upstream/master'","Marcel Vangrootheest"],["fb37b2d6bfb9cd0ee0dac15d08738365d2a638e9","914d964794f22e3617225721254ea1b6d59a9911@ymail.com","Merge branch 'master' into develop/duncan","Duncan Donaldson"],["a64b63ed73fcb2eef2936b3d18c96507a707d2d5","914d964794f22e3617225721254ea1b6d59a9911@ymail.com","Merge https://github.com/dc2011/td into develop/DTRAIN\n\nConflicts:\n\tsrc/network/netmessages.h","Duncan Donaldson"],["16b5b5068cc08760081b98467160c516da5426d2","914d964794f22e3617225721254ea1b6d59a9911@ymail.com","set up single-player mode with the lobby client","Duncan Donaldson"]],"repo":"mvan/td","actor":"DTRAIN","ref":"refs/heads/develop/duncan","size":7,"head":"16b5b5068cc08760081b98467160c516da5426d2","actor_gravatar":"3d0a8de4d53cdd9807551fa215bda024","push_id":26397279}