GitHub PushEvent at 2014-07-10 12:27:50
Repository: PSMG_Alarm
Actor: rupertMme
Payload: {"shas":[["1717c75b5d18b6f49589a730324e88cc882afdef","af3626fa6a27fc62cd6714b4cd8fbc35c63aa446@stud.uni-regensburg.de","EnemyShooting Eingefügt","rupertMme",true],["ca1c14acc39e3b00000042949de7eb03c16b7d39","af3626fa6a27fc62cd6714b4cd8fbc35c63aa446@stud.uni-regensburg.de","Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tPSMG_Alarm/Assets/Prefab/Enemy.prefab\n\tPSMG_Alarm/Assets/Prefab/Submarine.prefab\n\tPSMG_Alarm/Assets/Prefab/Submarine.prefab.meta\n\tPSMG_Alarm/Assets/Scripts/EnemySpawner.cs\n\tPSMG_Alarm/Assets/Scripts/MovePlayer.cs\n\tPSMG_Alarm/ProjectSettings/TagManager.asset","rupertMme",true],["83287327123983f7021d47df45a9ed770750f79a","af3626fa6a27fc62cd6714b4cd8fbc35c63aa446@stud.uni-regensburg.de","Merge branch 'master' of https://github.com/Rameos/PSMG_Alarm","rupertMme",true]],"size":3,"ref":"refs/heads/master","head":"83287327123983f7021d47df45a9ed770750f79a"}