{"push_id":601181698,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"f11d402c6ea4da6b383b1713fdec98e1c9c6c1de","before":"f04c54c6cc4cf1adea5f9272cb6e4b25778f3fc1","commits":[{"sha":"19710154b32084d6b5d705226c2686dcd8a35052","author":{"email":"9ebed0bf539dd01c8bc74caa3ad01d401e0e32a7@ius.edu","name":"Matthew Ballard"},"message":"Learning chili\n\nAnother commit","distinct":true,"url":"https://api.github.com/repos/MatthewBallard0/Chili-DirectX-Framework-First/commits/19710154b32084d6b5d705226c2686dcd8a35052"},{"sha":"f11d402c6ea4da6b383b1713fdec98e1c9c6c1de","author":{"email":"9ebed0bf539dd01c8bc74caa3ad01d401e0e32a7@ius.edu","name":"Matthew Ballard"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tChili DirectX Framework.sdf\n\tChili DirectX Framework.v12.suo\n\tChili DirectX Framework/Debug/Chili Di.9E5C3038.tlog/CL.read.1.tlog\n\tChili DirectX Framework/Debug/Chili Di.9E5C3038.tlog/CL.write.1.tlog\n\tChili DirectX Framework/Debug/Chili Di.9E5C3038.tlog/Chili DirectX\nFramework.lastbuildstate\n\tChili DirectX Framework/Debug/Chili Di.9E5C3038.tlog/cl.command.1.tlog\n\tChili DirectX Framework/Debug/Chili\nDi.9E5C3038.tlog/link.command.1.tlog\n\tChili DirectX Framework/Debug/Chili Di.9E5C3038.tlog/link.read.1.tlog\n\tChili DirectX Framework/Debug/Chili Di.9E5C3038.tlog/link.write.1.tlog\n\tChili DirectX Framework/Debug/Chili DirectX Framework.log\n\tChili DirectX Framework/Debug/D3DGraphics.obj\n\tChili DirectX Framework/Debug/Game.obj\n\tChili DirectX Framework/Debug/Keyboard.obj\n\tChili DirectX Framework/Debug/Timer.obj\n\tChili DirectX Framework/Debug/Windows.obj\n\tChili DirectX Framework/Debug/vc120.idb\n\tChili DirectX Framework/Debug/vc120.pdb\n\tDebug/Chili DirectX Framework.exe\n\tDebug/Chili DirectX Framework.ilk\n\tDebug/Chili DirectX Framework.pdb","distinct":true,"url":"https://api.github.com/repos/MatthewBallard0/Chili-DirectX-Framework-First/commits/f11d402c6ea4da6b383b1713fdec98e1c9c6c1de"}]}