GitHub PushEvent at 2014-02-19 01:59:51
Repository: FPS_Flappy
Actor: soggychips
Payload: {"shas":[["47cc8bfb0ef3092389060313e67f00e1aa66f705","689200671eea9d519ff6348481bfc90b1a966532@socal.rr.com","Merge branch 'bird-control'","Jake Cohen",false],["e0c387e2b3cd2f0d4617b4da635b3e0273c34bd5","3d51c856ed370a6777cf986f72b187016904604e@outlook.com","Basic UI\n\nBasic gui elements added for before game start and score after death","Jonathan Banashek",false],["9222c97d68a5e5e506749eb48d5ed2e367199c60","3d51c856ed370a6777cf986f72b187016904604e@outlook.com","Basic gui prototyping finished","Jonathan Banashek",false],["440e2bde53cc9b185e387777214a447a445ec030","689200671eea9d519ff6348481bfc90b1a966532@socal.rr.com","Merge remote-tracking branch 'origin/UI_Elements' into bird-UI-merge-test\n\nConflicts:\n\tFPS_Flappy.userprefs\n\tLibrary/CurrentLayout.dwlt\n\tLibrary/ScriptAssemblies/Assembly-CSharp.dll\n\tLibrary/ScriptAssemblies/Assembly-CSharp.dll.mdb\n\tLibrary/assetDatabase3\n\tLibrary/expandedItems\n\tLibrary/guidmapper\n\tLibrary/metadata/be/bea00ce6ba8229c47b93db3d1a1469e2\n\tLibrary/metadata/cf/cf04ab9e4cec24c0ba27ce3c2c9a5328","Jake Cohen",true]],"size":4,"ref":"refs/heads/bird-UI-merge-test","head":"440e2bde53cc9b185e387777214a447a445ec030"}