GitHub PushEvent at 2014-08-11 05:20:09
Repository: JapanMQP
Actor: ctmanuel
Payload: {"shas":[["a68aec530befac17a5b50c6cea188423d130e995","6ef567681381992b0b430fa0cf7c24cd5cdf3541@wpi.edu","Syncing to master","Christian Manuel",true],["ca0a52f6d59c12755839bab3bcc248787a14061e","6ef567681381992b0b430fa0cf7c24cd5cdf3541@wpi.edu","Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tC4/MQP.dll\n\tC4/MQP.exp\n\tC4/MQP.ilk\n\tC4/MQP.lib\n\tC4/MQP.pdb\n\tMQP/MQP.sdf\n\tMQP/MQP.v12.suo\n\tMQP/MQP/Debug/Game.obj\n\tMQP/MQP/Debug/GameCamera.obj\n\tMQP/MQP/Debug/GameWorld.obj\n\tMQP/MQP/Debug/HandController.obj\n\tMQP/MQP/Debug/LightPathController.obj\n\tMQP/MQP/Debug/MQP.log\n\tMQP/MQP/Debug/MQP.tlog/CL.read.1.tlog\n\tMQP/MQP/Debug/MQP.tlog/CL.write.1.tlog\n\tMQP/MQP/Debug/MQP.tlog/MQP.write.1u.tlog\n\tMQP/MQP/Debug/MQP.tlog/link.read.1.tlog\n\tMQP/MQP/Debug/MQP.tlog/link.write.1.tlog\n\tMQP/MQP/Debug/Player.obj\n\tMQP/MQP/Debug/ResetAction.obj\n\tMQP/MQP/Debug/Tank.obj\n\tMQP/MQP/Debug/vc120.idb\n\tMQP/MQP/Debug/vc120.pdb","Christian Manuel",true],["0f4278fd6265b9993cb4271211e4246a9930c9f6","6ef567681381992b0b430fa0cf7c24cd5cdf3541@wpi.edu","Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tC4/MQP.dll\n\tC4/MQP.exp\n\tC4/MQP.ilk\n\tC4/MQP.lib\n\tC4/MQP.pdb\n\tMQP/MQP.sdf\n\tMQP/MQP.v12.suo\n\tMQP/MQP/Debug/Game.obj\n\tMQP/MQP/Debug/GameCamera.obj\n\tMQP/MQP/Debug/GameWorld.obj\n\tMQP/MQP/Debug/HandController.obj\n\tMQP/MQP/Debug/LightPathController.obj\n\tMQP/MQP/Debug/MQP.log\n\tMQP/MQP/Debug/MQP.tlog/CL.read.1.tlog\n\tMQP/MQP/Debug/MQP.tlog/CL.write.1.tlog\n\tMQP/MQP/Debug/MQP.tlog/MQP.write.1u.tlog\n\tMQP/MQP/Debug/MQP.tlog/link.read.1.tlog\n\tMQP/MQP/Debug/MQP.tlog/link.write.1.tlog\n\tMQP/MQP/Debug/Player.obj\n\tMQP/MQP/Debug/ResetAction.obj\n\tMQP/MQP/Debug/Tank.obj\n\tMQP/MQP/Debug/vc120.idb\n\tMQP/MQP/Debug/vc120.pdb","Christian Manuel",true],["7972acd25b13930e323c2f46958007af2c29514b","6ef567681381992b0b430fa0cf7c24cd5cdf3541@wpi.edu","Adds Animation to the gauntlet","Christian Manuel",true],["ad72f2f61e143beb8eac8e91a124a656966f9942","6ef567681381992b0b430fa0cf7c24cd5cdf3541@wpi.edu","Merge branch 'master' of https://github.com/ctmanuel/JapanMQP\n\nConflicts:\n\tC4/MQP.dll\n\tC4/MQP.exp\n\tC4/MQP.ilk\n\tC4/MQP.lib\n\tC4/MQP.pdb\n\tMQP/MQP.sdf\n\tMQP/MQP.v12.suo\n\tMQP/MQP/Debug/HandController.obj\n\tMQP/MQP/Debug/LightPathController.obj\n\tMQP/MQP/Debug/MQP.log\n\tMQP/MQP/Debug/MQP.tlog/MQP.write.1u.tlog\n\tMQP/MQP/Debug/Player.obj\n\tMQP/MQP/Debug/ResetAction.obj\n\tMQP/MQP/Debug/Tank.obj\n\tMQP/MQP/Debug/vc120.idb\n\tMQP/MQP/Debug/vc120.pdb","Christian Manuel",true],["6a0afd067ab35a874e9a9add61be7df6abf52222","6ef567681381992b0b430fa0cf7c24cd5cdf3541@wpi.edu","Merge branch 'master' of https://github.com/ctmanuel/JapanMQP\n\nConflicts:\n\tC4/MQP.dll\n\tC4/MQP.exp\n\tC4/MQP.ilk\n\tC4/MQP.lib\n\tC4/MQP.pdb\n\tMQP/MQP.sdf\n\tMQP/MQP.v12.suo\n\tMQP/MQP/Debug/HandController.obj\n\tMQP/MQP/Debug/LightPathController.obj\n\tMQP/MQP/Debug/MQP.log\n\tMQP/MQP/Debug/MQP.tlog/MQP.write.1u.tlog\n\tMQP/MQP/Debug/Player.obj\n\tMQP/MQP/Debug/ResetAction.obj\n\tMQP/MQP/Debug/Tank.obj\n\tMQP/MQP/Debug/vc120.idb\n\tMQP/MQP/Debug/vc120.pdb","Christian Manuel",true]],"size":6,"ref":"refs/heads/master","head":"6a0afd067ab35a874e9a9add61be7df6abf52222"}