{"shas":[["54ad2d44f42ccdd09fbce6821aa327744d4c9bc5","0a96b47d8663667d902ca52682ad1e42f2ed1533@gmail.com","Merge branch 'release-0.1' into experimental-newGUI\n\nConflicts:\n\tClasses/CSModel.h\n\tClasses/CSModel.m\n\tResources/English.lproj/MainMenu.xib\n\tcocoshop.xcodeproj/project.pbxproj\n\nAll conflicting files taken from experimental-newGUI, like\n--strategy ours, but works.","Stepan Generalov"],["10b8050aa602ac0a3d9c5dc7e4b3cee88755f670","0a96b47d8663667d902ca52682ad1e42f2ed1533@gmail.com","Lot of changes by @andrew0\n\nConflicts:\n\n\tClasses/CSObjectController.h","Stepan Generalov"],["95cf5ff89a342098db6408389abd2fa309c7d518","fcf991fbbcc17ba62e082117bbda23d54c636413@gmail.com","#44 - sorta implemented it but idk if this is the best way of doing it. might need to rework.","Andrew"],["e04dcb18c5b1018ca7863cd9906c1cf6a4867136","fcf991fbbcc17ba62e082117bbda23d54c636413@gmail.com","reimplement CSNode. Fixes #44","Andrew"],["704cfc04e60982c14d4e5075dc1e4303e510dfeb","0a96b47d8663667d902ca52682ad1e42f2ed1533@gmail.com","Merge remote-tracking branch 'origin/develop' into experimental-newGUI","Stepan Generalov"]],"ref":"refs/heads/develop","size":5,"head":"704cfc04e60982c14d4e5075dc1e4303e510dfeb","push_id":34971020}