{"shas":[["b29c2f6f304d71c561c33e2845e41cd2b703f018","476f675636c71b2e05ef2e6d2dd7cc4598b8c338@gmail.com","Merge branch 'master' into connection\n\nConflicts:\n\tComm Audio.vcxproj\n\tComm Audio.vcxproj.filters\n\tmainwindow.cpp\n\tmainwindow.h","Darryl Pogue"],["b377a187971311893a765ac164ffdb51a4e678a2","476f675636c71b2e05ef2e6d2dd7cc4598b8c338@gmail.com","Manually fix merges.","Darryl Pogue"]],"repo":"dvpdiner2/CommAudio","actor":"dvpdiner2","ref":"refs/heads/connection","size":2,"head":"b377a187971311893a765ac164ffdb51a4e678a2","actor_gravatar":"bd12d450af042bb75ce2f15c5d389e0a","push_id":27050555}