{"push_id":900898534,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"8fef432dd794bc651f6117b2a038b997ade19785","before":"963a07c734b56bebe571a0c60079cca26468c7e5","commits":[{"sha":"b9e77712cee9ff3ef272723a52892446ed730200","author":{"email":"48d1dbfacc0e3d1c9fd7a361775d46274ebe1de7@yandex.ru","name":"Leonid133"},"message":"Автопилот ++","distinct":true,"url":"https://api.github.com/repos/leonid133/quadro_unity/commits/b9e77712cee9ff3ef272723a52892446ed730200"},{"sha":"8fef432dd794bc651f6117b2a038b997ade19785","author":{"email":"48d1dbfacc0e3d1c9fd7a361775d46274ebe1de7@yandex.ru","name":"Leonid133"},"message":"Merge branch 'master' of https://github.com/leonid133/quadro_unity\n\nConflicts:\n\tquadrocopter-unity-opencv/.vs/quadrocopter-unity-opencv/v14/.suo\n\tquadrocopter-unity-opencv/Assets/quadro1.unity\n\tquadrocopter-unity-opencv/Assets/quadrocopterScript.cs\n\tquadrocopter-unity-opencv/Library/InspectorExpandedItems.asset\n\tquadrocopter-unity-opencv/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll\n\tquadrocopter-unity-opencv/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb\n\tquadrocopter-unity-opencv/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll\n\tquadrocopter-unity-opencv/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb\n\tquadrocopter-unity-opencv/Library/ScriptAssemblies/Assembly-CSharp.dll\n\tquadrocopter-unity-opencv/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb\n\tquadrocopter-unity-opencv/Library/UnityAssemblies/UnityEditor.Advertisements.dll\n\tquadrocopter-unity-opencv/Library/UnityAssemblies/UnityEditor.Android.Extensions.dll\n\tquadrocopter-unity-opencv/Library/UnityAssemblies/UnityEditor.Graphs.dll\n\tquadrocopter-unity-opencv/Library/UnityAssemblies/UnityEditor.LinuxStandalone.Extensions.dll\n\tquadrocopter-unity-opencv/Library/UnityAssemblies/UnityEditor.Metro.Extensions.dll\n\tquadrocopter-unity-opencv/Library/UnityAssemblies/UnityEditor.Networking.dll\n\tquadrocopter-unity-opencv/Library/UnityAssemblies/UnityEditor.OSXStandalone.Extensions.dll\n\tquadrocopter-unity-opencv/Library/UnityAssemblies/UnityEditor.SamsungTV.Extensions.dll\n\tquadrocopter-unity-opencv/Library/UnityAssemblies/UnityEditor.Tizen.Extensions.dll\n\tquadrocopter-unity-opencv/Library/UnityAssemblies/UnityEditor.UI.dll\n\tquadrocopter-unity-opencv/Library/UnityAssemblies/UnityEditor.WP8.Extensions.dll\n\tquadrocopter-unity-opencv/Library/UnityAssemblies/UnityEditor.WebGL.Extensions.dll\n\tquadrocopter-unity-opencv/Library/UnityAssemblies/UnityEditor.WindowsStandalone.Extensions.dll\n\tquadrocopter-unity-opencv/Library/UnityAssemblies/UnityEditor.iOS.Extensions.Xcode.dll\n\tquadrocopter-unity-opencv/Library/assetDatabase3\n\tquadrocopter-unity-opencv/Library/metadata/00/00000000000000004000000000000000\n\tquadrocopter-unity-opencv/Library/metadata/f4/f41a46219a1bb4248b957f8aac89aa1f\n\tquadrocopter-unity-opencv/Library/shadercompiler-32bit-1.log\n\tquadrocopter-unity-opencv/Library/shadercompiler-64bit-1.log\n\tquadrocopter-unity-opencv/Temp/ProcessJobs/e9a6970f79cd12d8b075e7d72f1b07cb.bakert\n\tquadrocopter-unity-opencv/Temp/UnityVS_bin/Debug/Assembly-CSharp-firstpass.dll\n\tquadrocopter-unity-opencv/Temp/UnityVS_bin/Debug/Assembly-CSharp-firstpass.pdb\n\tquadrocopter-unity-opencv/Temp/UnityVS_bin/Debug/Assembly-CSharp.dll\n\tquadrocopter-unity-opencv/Temp/UnityVS_bin/Debug/Assembly-CSharp.pdb\n\tquadrocopter-unity-opencv/Temp/UnityVS_bin/Debug/UnityEditor.iOS.Extensions.Xcode.dll\n\tquadrocopter-unity-opencv/Temp/UnityVS_obj/Debug/Assembly-CSharp-firstpass.dll\n\tquadrocopter-unity-opencv/Temp/UnityVS_obj/Debug/Assembly-CSharp-firstpass.pdb\n\tquadrocopter-unity-opencv/Temp/UnityVS_obj/Debug/Assembly-CSharp.dll\n\tquadrocopter-unity-opencv/Temp/UnityVS_obj/Debug/Assembly-CSharp.pdb\n\tquadrocopter-unity-opencv/Temp/UnityVS_obj/Debug/quadrocopter-unity-opencv.CSharp.Plugins.csprojResolveAssemblyReference.cache\n\tquadrocopter-unity-opencv/Temp/UnityVS_obj/Debug/quadrocopter-unity-opencv.CSharp.csproj.FileListAbsolute.txt\n\tquadrocopter-unity-opencv/Temp/UnityVS_obj/Debug/quadrocopter-unity-opencv.CSharp.csprojResolveAssemblyReference.cache\n\tquadrocopter-unity-opencv/Temp/__EditModeScene","distinct":true,"url":"https://api.github.com/repos/leonid133/quadro_unity/commits/8fef432dd794bc651f6117b2a038b997ade19785"}]}