GitHub PushEvent at 2014-06-19 22:02:19
Repository: Dino
Actor: mauriciozaragoza
Payload: {"shas":[["9765351ae8ed1a69a1f33dc115f3ad335240d8f2","ea3b574bc220ba3857266f274fc475ecd23a9ed9@gmail.com","Basic energy bar implementation","Mauricio Zaragoza",true],["4f23e0be2e8224b79a34a76f1213883f725f56c1","ea3b574bc220ba3857266f274fc475ecd23a9ed9@gmail.com","Merge branch 'master' of github.com:ivan-i1/Dino\n\nConflicts:\n\tAssets/EnergyBar.cs.meta\n\tAssets/Trigger.cs.meta\n\tAssets/dinoo.unity\n\tAssets/killPlayer.cs.meta","Mauricio Zaragoza",true]],"size":2,"ref":"refs/heads/master","head":"4f23e0be2e8224b79a34a76f1213883f725f56c1"}