{"shas":[["62d637636d4015b97c57925e4e50b8428adfde7c","1363275402fda4be37631fe2179a3cb2ec65d046@gmail.com","Merge branch 'master' of https://github.com/oy/teeworlds into base_tdtw\n\nConflicts:\n\tsrc/game/client/render.h\n\tsrc/game/client/render_map.cpp\n\tsrc/game/editor/layer_tiles.cpp","PsychoGod"]],"ref":"refs/heads/master","size":1,"head":"62d637636d4015b97c57925e4e50b8428adfde7c","push_id":37821046}