{"push_id":1439911296,"size":13,"distinct_size":0,"ref":"refs/heads/team1","head":"487efb4a73cacfe1821093427ec7a34593fade66","before":"693ea9c19218016e076033ba59e8c08c46e7038c","commits":[{"sha":"5c4b81dd235b7acf0d6789678e8e7b754cda673b","author":{"name":"root","email":"0ddec2d7e784f56fe0bd4fe295b4b53464af379c@localhost.localdomain"},"message":"finished makefile and scripts for installing and cleaning up openframeworks and libfreenect","distinct":false,"url":"https://api.github.com/repos/OpenISS/OpenISS/commits/5c4b81dd235b7acf0d6789678e8e7b754cda673b"},{"sha":"0c59e748ef25b0c53023e661adea2ac46bd5d60e","author":{"name":"Lucas Spiker","email":"ec961c8a1d59957ae8b39a392037a8da1fec979c@gmail.com"},"message":"Added project report file in project root. Currently has team info, build instructions, and a list of known bugs.","distinct":false,"url":"https://api.github.com/repos/OpenISS/OpenISS/commits/0c59e748ef25b0c53023e661adea2ac46bd5d60e"},{"sha":"7ba45bf47a8c987b86f923a9368f51652af40437","author":{"name":"Serguei Mokhov","email":"1f9ebe0ce1383bbe04c20473ce8dc1259537c48b@cse.concordia.ca"},"message":"Manually merge PR#2 after resolving conflicts.","distinct":false,"url":"https://api.github.com/repos/OpenISS/OpenISS/commits/7ba45bf47a8c987b86f923a9368f51652af40437"},{"sha":"294dc3cbc9ad4db547b2689ac90b4d69ac0608cc","author":{"name":"Serguei Mokhov","email":"1f9ebe0ce1383bbe04c20473ce8dc1259537c48b@cse.concordia.ca"},"message":"Merge branch 'theMagicDunky-master'.","distinct":false,"url":"https://api.github.com/repos/OpenISS/OpenISS/commits/294dc3cbc9ad4db547b2689ac90b4d69ac0608cc"},{"sha":"34a6b8d1ce7d907fc51f88d23cfb93e92b18d778","author":{"name":"Serguei Mokhov","email":"1f9ebe0ce1383bbe04c20473ce8dc1259537c48b@cse.concordia.ca"},"message":"Re-add accidental remove of ofx pointer.","distinct":false,"url":"https://api.github.com/repos/OpenISS/OpenISS/commits/34a6b8d1ce7d907fc51f88d23cfb93e92b18d778"},{"sha":"801737b3afc52155c51c77df580c051eb3dc841f","author":{"name":"Serguei Mokhov","email":"1f9ebe0ce1383bbe04c20473ce8dc1259537c48b@cse.concordia.ca"},"message":"[build] Correct integrated Makefile from two groups to make it work again.","distinct":false,"url":"https://api.github.com/repos/OpenISS/OpenISS/commits/801737b3afc52155c51c77df580c051eb3dc841f"},{"sha":"521cd6738559b9fc1bd14135bbf5b758a31e5da3","author":{"name":"Serguei Mokhov","email":"1f9ebe0ce1383bbe04c20473ce8dc1259537c48b@cse.concordia.ca"},"message":"[build] properly preserve dir structure","distinct":false,"url":"https://api.github.com/repos/OpenISS/OpenISS/commits/521cd6738559b9fc1bd14135bbf5b758a31e5da3"},{"sha":"8cad3b26aef005325910e95fb708ebc6eec2049e","author":{"name":"Serguei Mokhov","email":"1f9ebe0ce1383bbe04c20473ce8dc1259537c48b@cse.concordia.ca"},"message":"[build] more scripting clean up","distinct":false,"url":"https://api.github.com/repos/OpenISS/OpenISS/commits/8cad3b26aef005325910e95fb708ebc6eec2049e"},{"sha":"0c1b0369a8e62aa9230b2d218e1a59acacad59e8","author":{"name":"student","email":"1d489e31ce07e8f68a064103c90c625964e09b3f@localhost.localdomain"},"message":"Changed the build.sh shell script to handle patching and building tinyosc. Also added the needed patch file in the dependencies folder.","distinct":false,"url":"https://api.github.com/repos/OpenISS/OpenISS/commits/0c1b0369a8e62aa9230b2d218e1a59acacad59e8"},{"sha":"bb6554ef80a1ec45d5111f604735746b0c748d99","author":{"name":"root","email":"0ddec2d7e784f56fe0bd4fe295b4b53464af379c@localhost.localdomain"},"message":"Added in tinyosc as a submodule.","distinct":false,"url":"https://api.github.com/repos/OpenISS/OpenISS/commits/bb6554ef80a1ec45d5111f604735746b0c748d99"},{"sha":"83155aae4fe4bbf83c7b845050d7635b0dc20b7e","author":{"name":"Serguei Mokhov","email":"1f9ebe0ce1383bbe04c20473ce8dc1259537c48b@cse.concordia.ca"},"message":"Merge commit '693ea9c19218016e076033ba59e8c08c46e7038c'","distinct":false,"url":"https://api.github.com/repos/OpenISS/OpenISS/commits/83155aae4fe4bbf83c7b845050d7635b0dc20b7e"},{"sha":"737e6b81d26d2f1563449c2670c3ebc5329de9a2","author":{"name":"Serguei Mokhov","email":"1f9ebe0ce1383bbe04c20473ce8dc1259537c48b@cse.concordia.ca"},"message":"Merge branch 'master' of https://github.com/theMagicDunky/OpenISS into team2.\nThis closes PR#1, but till need to merge between the teams.\n\n# Conflicts resolved:\n#\t.gitmodules","distinct":false,"url":"https://api.github.com/repos/OpenISS/OpenISS/commits/737e6b81d26d2f1563449c2670c3ebc5329de9a2"},{"sha":"487efb4a73cacfe1821093427ec7a34593fade66","author":{"name":"Serguei Mokhov","email":"1f9ebe0ce1383bbe04c20473ce8dc1259537c48b@cse.concordia.ca"},"message":"Merge branch 'team2'.\n\nConflicts:\n\tsrc/Makefile\n\tsrc/scripts/build.sh\n\tsrc/scripts/dependencies/el6.sh","distinct":false,"url":"https://api.github.com/repos/OpenISS/OpenISS/commits/487efb4a73cacfe1821093427ec7a34593fade66"}]}
{"actor":{"display_login":"smokhov"}}