{"push_id":1286298800,"size":10,"distinct_size":1,"ref":"refs/heads/master","head":"58d66df0eafcb901e1ca55fb3f8545d48f3be56b","before":"0dc139045bcc12a7f3f0d3d78f702800d82d4d94","commits":[{"sha":"a8a0bbba97d52c70f8ad73da377c29020869d3d0","author":{"name":"quantumpanic","email":"e586fe483af75bc0b957f2db51e670a562e27bae@matatacorp"},"message":"daily merge","distinct":false,"url":"https://api.github.com/repos/quantumpanic/matataClash3/commits/a8a0bbba97d52c70f8ad73da377c29020869d3d0"},{"sha":"29fcf100b36149299dc709a9ea856b6f8679b4e5","author":{"name":"quantumpanic","email":"e586fe483af75bc0b957f2db51e670a562e27bae@matatacorp"},"message":"Merge branch 'master' into mbal2","distinct":false,"url":"https://api.github.com/repos/quantumpanic/matataClash3/commits/29fcf100b36149299dc709a9ea856b6f8679b4e5"},{"sha":"4e742e9f6e25059c307fbd56dd5b7a8247bcdcaa","author":{"name":"quantumpanic","email":"e586fe483af75bc0b957f2db51e670a562e27bae@matatacorp"},"message":"Merge branch 'master' into mbal2\n\n# Conflicts:\n#\tmatataClash/Assets/RAIN/Editor/RAINProjectState.asset\n#\tmatataClash/Assets/Script/BuildingScript.cs\n#\tmatataClash/Assets/prefabs/Tile Base.prefab\n#\tmatataClash/Assets/prefabs/Town Hall.prefab\n#\tmatataClash/Library/InspectorExpandedItems.asset\n#\tmatataClash/Library/ScriptAssemblies/Assembly-Boo-Editor.dll\n#\tmatataClash/Library/ScriptAssemblies/Assembly-Boo-Editor.dll.mdb\n#\tmatataClash/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll\n#\tmatataClash/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb\n#\tmatataClash/Library/ScriptAssemblies/Assembly-CSharp.dll\n#\tmatataClash/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb\n#\tmatataClash/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll\n#\nmatataClash/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb\n#\tmatataClash/Library/assetDatabase3\n#\tmatataClash/Library/metadata/00/00000000000000004000000000000000\n#\tmatataClash/Library/metadata/07/07910cdc77abc43a19c1816bdf5ae959.info\n#\tmatataClash/Library/metadata/fa/fa9260e6f334e490a859e4a3b5dccb26.info\n#\tmatataClash/Temp/__Backupscenes/0.backup\n#\tmatataClash/Temp/bin/Debug/Assembly-CSharp.dll\n#\tmatataClash/Temp/bin/Debug/Assembly-CSharp.dll.mdb\n#\tmatataClash/obj/Debug/Assembly-CSharp.dll\n#\tmatataClash/obj/Debug/Assembly-CSharp.dll.mdb","distinct":false,"url":"https://api.github.com/repos/quantumpanic/matataClash3/commits/4e742e9f6e25059c307fbd56dd5b7a8247bcdcaa"},{"sha":"ce5271b265489ae0183dcf81eaa0dc33d686fa61","author":{"name":"quantumpanic","email":"e586fe483af75bc0b957f2db51e670a562e27bae@matatacorp"},"message":"Merge branch 'master' into mbal2\n\n# Conflicts:\n#\tmatataClash/Assets/RAIN/Editor/RAINProjectState.asset\n#\tmatataClash/Assets/mbal/mbalScene.unity\n#\tmatataClash/Assets/prefabs/Wall.prefab\n#\tmatataClash/Assets/prefabs/Wall.prefab.meta\n#\tmatataClash/Library/ScriptAssemblies/Assembly-Boo-Editor.dll\n#\tmatataClash/Library/ScriptAssemblies/Assembly-Boo-Editor.dll.mdb\n#\tmatataClash/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll\n#\tmatataClash/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb\n#\tmatataClash/Library/ScriptAssemblies/Assembly-CSharp.dll\n#\tmatataClash/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb\n#\tmatataClash/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll\n#\nmatataClash/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb\n#\tmatataClash/Library/assetDatabase3\n#\tmatataClash/Library/metadata/00/00000000000000004000000000000000\n#\tmatataClash/Library/metadata/93/936c8cf615fa4422e85a840f3530116d\n#\tmatataClash/Library/metadata/a3/a31e731212fcd4200ac3f10c50d7335f\n#\tmatataClash/Library/metadata/b9/b93bb98f344b34f6fa4d823224e5e3dd\n#\tmatataClash/Temp/__Backupscenes/0.backup\n#\tmatataClash/Temp/bin/Debug/Assembly-CSharp.dll\n#\tmatataClash/Temp/bin/Debug/Assembly-CSharp.dll.mdb\n#\tmatataClash/obj/Debug/Assembly-CSharp.dll.mdb","distinct":false,"url":"https://api.github.com/repos/quantumpanic/matataClash3/commits/ce5271b265489ae0183dcf81eaa0dc33d686fa61"},{"sha":"c88df8fc37aec212dd514656f79a149ffe2b3a96","author":{"name":"quantumpanic","email":"e586fe483af75bc0b957f2db51e670a562e27bae@matatacorp"},"message":"Merge branch 'master' into mbal2\n\n# Conflicts:\n#\tmatataClash/Assets/RAIN/Editor/RAINProjectState.asset\n#\tmatataClash/Assets/mbal/mbalScene.unity\n#\tmatataClash/Assets/prefabs/Wall.prefab\n#\tmatataClash/Assets/prefabs/Wall.prefab.meta\n#\tmatataClash/Library/ScriptAssemblies/Assembly-Boo-Editor.dll\n#\tmatataClash/Library/ScriptAssemblies/Assembly-Boo-Editor.dll.mdb\n#\tmatataClash/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll\n#\tmatataClash/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb\n#\tmatataClash/Library/ScriptAssemblies/Assembly-CSharp.dll\n#\tmatataClash/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb\n#\tmatataClash/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll\n#\nmatataClash/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb\n#\tmatataClash/Library/assetDatabase3\n#\tmatataClash/Library/metadata/00/00000000000000004000000000000000\n#\tmatataClash/Library/metadata/93/936c8cf615fa4422e85a840f3530116d\n#\tmatataClash/Library/metadata/a3/a31e731212fcd4200ac3f10c50d7335f\n#\tmatataClash/Library/metadata/b9/b93bb98f344b34f6fa4d823224e5e3dd\n#\tmatataClash/Temp/UnityTempFile-03e02ae4981d74a209d639861c7cc08a\n#\tmatataClash/Temp/UnityTempFile-04a41032214cd4564ac2a0efb1f470e0\n#\tmatataClash/Temp/UnityTempFile-051f57033e52041ad8e4d14c8346bbe0\n#\tmatataClash/Temp/UnityTempFile-072f209217a65465e84368d22bd01391\n#\tmatataClash/Temp/UnityTempFile-150b56edfa553490aa983756995ef378\n#\tmatataClash/Temp/UnityTempFile-183008d13cff04653bf73e471e935c8b\n#\tmatataClash/Temp/UnityTempFile-46e44bd14e74848528bea494417a271b\n#\tmatataClash/Temp/UnityTempFile-4a97dd25fa0fd4e77b0f24eeecc0d04b\n#\tmatataClash/Temp/UnityTempFile-5aae0b963d95e4b4b9e62c940c0a86ce\n#\tmatataClash/Temp/UnityTempFile-6554688ed99694497b3bef524aeb98f7\n#\tmatataClash/Temp/UnityTempFile-696a3445460b94277b97c6ed32e49c26\n#\tmatataClash/Temp/UnityTempFile-7fddb29af4dbd41da8ed9dd3dd5f808c\n#\tmatataClash/Temp/UnityTempFile-9473ecd6861494ac2b8e39c3f988cc28\n#\tmatataClash/Temp/UnityTempFile-a51d6a850bada42c1ad17da0ac649a0b\n#\tmatataClash/Temp/UnityTempFile-b268b2f30f82a48ddbae7d63a853def7\n#\tmatataClash/Temp/UnityTempFile-b40b5b197b1984227a84f0fffaff405b\n#\tmatataClash/Temp/UnityTempFile-b745eb533a3fb4c9b889bc7e08f7ac34\n#\tmatataClash/Temp/UnityTempFile-b7a93362a67674efd84fa61329a7767c\n#\tmatataClash/Temp/UnityTempFile-f41ffac70dc5d4b8cb9b641dc029a867\n#\tmatataClash/Temp/UnityTempFile-fd9bb4de274fc4543a7e3377ab521c7b\n#\tmatataClash/Temp/__Backupscenes/0.backup\n#\tmatataClash/Temp/bin/Debug/Assembly-CSharp.dll\n#\tmatataClash/Temp/bin/Debug/Assembly-CSharp.dll.mdb\n#\tmatataClash/obj/Debug/Assembly-CSharp.dll.mdb","distinct":false,"url":"https://api.github.com/repos/quantumpanic/matataClash3/commits/c88df8fc37aec212dd514656f79a149ffe2b3a96"},{"sha":"be0403f9cb8b81c4ab2380bca88318a8cba480ba","author":{"name":"quantumpanic","email":"e586fe483af75bc0b957f2db51e670a562e27bae@matatacorp"},"message":"merging","distinct":false,"url":"https://api.github.com/repos/quantumpanic/matataClash3/commits/be0403f9cb8b81c4ab2380bca88318a8cba480ba"},{"sha":"129ecce370d54e86351175fe9ed3e86d67d83c94","author":{"name":"quantumpanic","email":"e586fe483af75bc0b957f2db51e670a562e27bae@matatacorp"},"message":"Merge branch 'master' into mbal2\n\n# Conflicts:\n#\tmatataClash/Assets/RAIN/Editor/RAINProjectState.asset\n#\tmatataClash/Assets/mbal/mbalScene.unity\n#\tmatataClash/Assets/prefabs/Wall.prefab\n#\tmatataClash/Assets/prefabs/Wall.prefab.meta\n#\tmatataClash/Library/ScriptAssemblies/Assembly-Boo-Editor.dll\n#\tmatataClash/Library/ScriptAssemblies/Assembly-Boo-Editor.dll.mdb\n#\tmatataClash/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll\n#\tmatataClash/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb\n#\tmatataClash/Library/ScriptAssemblies/Assembly-CSharp.dll\n#\tmatataClash/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb\n#\tmatataClash/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll\n#\nmatataClash/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb\n#\tmatataClash/Library/assetDatabase3\n#\tmatataClash/Library/metadata/00/00000000000000004000000000000000\n#\tmatataClash/Library/metadata/93/936c8cf615fa4422e85a840f3530116d\n#\nmatataClash/Library/metadata/93/936c8cf615fa4422e85a840f3530116d~master\n#\tmatataClash/Library/metadata/b9/b93bb98f344b34f6fa4d823224e5e3dd\n#\tmatataClash/Temp/UnityTempFile-03e02ae4981d74a209d639861c7cc08a\n#\tmatataClash/Temp/UnityTempFile-04a41032214cd4564ac2a0efb1f470e0\n#\tmatataClash/Temp/UnityTempFile-051f57033e52041ad8e4d14c8346bbe0\n#\tmatataClash/Temp/UnityTempFile-072f209217a65465e84368d22bd01391\n#\tmatataClash/Temp/UnityTempFile-150b56edfa553490aa983756995ef378\n#\tmatataClash/Temp/UnityTempFile-183008d13cff04653bf73e471e935c8b\n#\tmatataClash/Temp/UnityTempFile-46e44bd14e74848528bea494417a271b\n#\tmatataClash/Temp/UnityTempFile-4a97dd25fa0fd4e77b0f24eeecc0d04b\n#\tmatataClash/Temp/UnityTempFile-5aae0b963d95e4b4b9e62c940c0a86ce\n#\tmatataClash/Temp/UnityTempFile-6554688ed99694497b3bef524aeb98f7\n#\tmatataClash/Temp/UnityTempFile-696a3445460b94277b97c6ed32e49c26\n#\tmatataClash/Temp/UnityTempFile-7fddb29af4dbd41da8ed9dd3dd5f808c\n#\tmatataClash/Temp/UnityTempFile-9473ecd6861494ac2b8e39c3f988cc28\n#\tmatataClash/Temp/UnityTempFile-a51d6a850bada42c1ad17da0ac649a0b\n#\tmatataClash/Temp/UnityTempFile-b268b2f30f82a48ddbae7d63a853def7\n#\tmatataClash/Temp/UnityTempFile-b40b5b197b1984227a84f0fffaff405b\n#\tmatataClash/Temp/UnityTempFile-b745eb533a3fb4c9b889bc7e08f7ac34\n#\tmatataClash/Temp/UnityTempFile-b7a93362a67674efd84fa61329a7767c\n#\tmatataClash/Temp/UnityTempFile-f41ffac70dc5d4b8cb9b641dc029a867\n#\tmatataClash/Temp/UnityTempFile-fd9bb4de274fc4543a7e3377ab521c7b\n#\tmatataClash/Temp/__Backupscenes/0.backup\n#\tmatataClash/Temp/bin/Debug/Assembly-CSharp.dll\n#\tmatataClash/Temp/bin/Debug/Assembly-CSharp.dll.mdb\n#\tmatataClash/obj/Debug/Assembly-CSharp.dll.mdb","distinct":false,"url":"https://api.github.com/repos/quantumpanic/matataClash3/commits/129ecce370d54e86351175fe9ed3e86d67d83c94"},{"sha":"8b842fd834c3a772e23cc1f624f4463ce02a6d64","author":{"name":"quantumpanic","email":"e586fe483af75bc0b957f2db51e670a562e27bae@matatacorp"},"message":"a","distinct":false,"url":"https://api.github.com/repos/quantumpanic/matataClash3/commits/8b842fd834c3a772e23cc1f624f4463ce02a6d64"},{"sha":"f8272f84bf81e5c7968d492d186c810d555cde2c","author":{"name":"quantumpanic","email":"e586fe483af75bc0b957f2db51e670a562e27bae@matatacorp"},"message":"Merge branch 'master' into mbal2\n\n# Conflicts:\n#\tmatataClash/Assets/RAIN/Editor/RAINProjectState.asset\n#\tmatataClash/Assets/mbal/mbalScene.unity\n#\tmatataClash/Assets/prefabs/Wall.prefab\n#\tmatataClash/Assets/prefabs/Wall.prefab.meta\n#\tmatataClash/Library/ScriptAssemblies/Assembly-Boo-Editor.dll\n#\tmatataClash/Library/ScriptAssemblies/Assembly-Boo-Editor.dll.mdb\n#\tmatataClash/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll\n#\tmatataClash/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb\n#\tmatataClash/Library/ScriptAssemblies/Assembly-CSharp.dll\n#\tmatataClash/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb\n#\tmatataClash/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll\n#\nmatataClash/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb\n#\tmatataClash/Library/assetDatabase3\n#\tmatataClash/Library/metadata/00/00000000000000004000000000000000\n#\tmatataClash/Library/metadata/93/936c8cf615fa4422e85a840f3530116d\n#\nmatataClash/Library/metadata/93/936c8cf615fa4422e85a840f3530116d~HEAD_0\n#\tmatataClash/Library/metadata/b9/b93bb98f344b34f6fa4d823224e5e3dd\n#\tmatataClash/Temp/UnityTempFile-03e02ae4981d74a209d639861c7cc08a\n#\tmatataClash/Temp/UnityTempFile-04a41032214cd4564ac2a0efb1f470e0\n#\tmatataClash/Temp/UnityTempFile-051f57033e52041ad8e4d14c8346bbe0\n#\tmatataClash/Temp/UnityTempFile-072f209217a65465e84368d22bd01391\n#\tmatataClash/Temp/UnityTempFile-150b56edfa553490aa983756995ef378\n#\tmatataClash/Temp/UnityTempFile-183008d13cff04653bf73e471e935c8b\n#\tmatataClash/Temp/UnityTempFile-46e44bd14e74848528bea494417a271b\n#\tmatataClash/Temp/UnityTempFile-4a97dd25fa0fd4e77b0f24eeecc0d04b\n#\tmatataClash/Temp/UnityTempFile-5aae0b963d95e4b4b9e62c940c0a86ce\n#\tmatataClash/Temp/UnityTempFile-6554688ed99694497b3bef524aeb98f7\n#\tmatataClash/Temp/UnityTempFile-696a3445460b94277b97c6ed32e49c26\n#\tmatataClash/Temp/UnityTempFile-7fddb29af4dbd41da8ed9dd3dd5f808c\n#\tmatataClash/Temp/UnityTempFile-9473ecd6861494ac2b8e39c3f988cc28\n#\tmatataClash/Temp/UnityTempFile-a51d6a850bada42c1ad17da0ac649a0b\n#\tmatataClash/Temp/UnityTempFile-b268b2f30f82a48ddbae7d63a853def7\n#\tmatataClash/Temp/UnityTempFile-b40b5b197b1984227a84f0fffaff405b\n#\tmatataClash/Temp/UnityTempFile-b745eb533a3fb4c9b889bc7e08f7ac34\n#\tmatataClash/Temp/UnityTempFile-b7a93362a67674efd84fa61329a7767c\n#\tmatataClash/Temp/UnityTempFile-f41ffac70dc5d4b8cb9b641dc029a867\n#\tmatataClash/Temp/UnityTempFile-fd9bb4de274fc4543a7e3377ab521c7b\n#\tmatataClash/Temp/__Backupscenes/0.backup\n#\tmatataClash/Temp/bin/Debug/Assembly-CSharp.dll\n#\tmatataClash/Temp/bin/Debug/Assembly-CSharp.dll.mdb\n#\tmatataClash/obj/Debug/Assembly-CSharp.dll.mdb","distinct":false,"url":"https://api.github.com/repos/quantumpanic/matataClash3/commits/f8272f84bf81e5c7968d492d186c810d555cde2c"},{"sha":"58d66df0eafcb901e1ca55fb3f8545d48f3be56b","author":{"name":"quantumpanic","email":"3c44666b94c41cf80a3ff76e988e5e35df104d7e@gmail.com"},"message":"Merge pull request #3 from quantumpanic/mbal2\n\nMbal2","distinct":true,"url":"https://api.github.com/repos/quantumpanic/matataClash3/commits/58d66df0eafcb901e1ca55fb3f8545d48f3be56b"}]}
{"actor":{"display_login":"quantumpanic"}}