{"head":"fa6055da97b42d24fdb638bc0c6ddfaabf474aba","size":2,"push_id":44047790,"shas":[["1e99c701a755c4cd3fe5fc8f25a1d3def23a741a","92b8c3d306da7c0976027e83bbf2a0513943366a@gmail.com","an ting","TGTS"],["fa6055da97b42d24fdb638bc0c6ddfaabf474aba","92b8c3d306da7c0976027e83bbf2a0513943366a@gmail.com","Merge branch 'master' of github.com:Alloyed/OSC-thing\n\nConflicts:\n\tBuilds/Linux/build/Oscant.so\n\tBuilds/VisualStudio2010/Oscant.dll\n\tBuilds/VisualStudio2010/Oscant.vcxproj\n\tBuilds/VisualStudio2010/Oscant.vcxproj.filters\n\tSource/PluginProcessor.cpp\n\tSource/PluginProcessor.h","TGTS"]],"ref":"refs/heads/master"}