{"push_id":1006178800,"size":4,"distinct_size":1,"ref":"refs/heads/Benoit","head":"c192172c4bffc2503f7eb0d9a0e767acf58bf85c","before":"be4325d88872bac6dd0fe30f05dde6b0c92d915b","commits":[{"sha":"5e9253cf86c785f1d85fcc4f5de880542355c9f1","author":{"email":"5347287b693ba41512a2136b8c8cfb9775004a0c@J102-3849-11.etudiant.rubika-edu.com.local","name":"unknown"},"message":"MainMenu selection working with Quit and Credits menus done.","distinct":false,"url":"https://api.github.com/repos/Nephet/DSI_2016/commits/5e9253cf86c785f1d85fcc4f5de880542355c9f1"},{"sha":"2b9eb78f11b74f0102939c46dc32e4a7a3643ad7","author":{"email":"5347287b693ba41512a2136b8c8cfb9775004a0c@J102-3849-11.etudiant.rubika-edu.com.local","name":"unknown"},"message":"Merge branch 'master' of https://github.com/Nephet/DSI_2016 into Flavien\n\n# Conflicts:\n#\tAssets/Scenes/MainMenu.unity\n#\tAssets/Scripts/ButtonManager.cs\n#\tLibrary/CurrentLayout.dwlt\n#\tLibrary/InspectorExpandedItems.asset\n#\tLibrary/LastSceneManagerSetup.txt\n#\tLibrary/assetDatabase3\n#\tLibrary/expandedItems\n#\tLibrary/metadata/00/00000000000000002000000000000000\n#\tLibrary/metadata/00/00000000000000003000000000000000\n#\tLibrary/metadata/00/00000000000000004000000000000000\n#\tLibrary/metadata/00/00000000000000004100000000000000\n#\tLibrary/metadata/00/00000000000000005000000000000000\n#\tLibrary/metadata/00/00000000000000005100000000000000\n#\tLibrary/metadata/00/00000000000000006000000000000000\n#\tLibrary/metadata/00/00000000000000006100000000000000\n#\tLibrary/metadata/00/00000000000000007000000000000000\n#\tLibrary/metadata/00/00000000000000007100000000000000\n#\tLibrary/metadata/00/00000000000000008000000000000000\n#\tLibrary/metadata/00/00000000000000008100000000000000\n#\tLibrary/metadata/00/00000000000000009000000000000000\n#\tLibrary/metadata/00/0000000000000000a000000000000000\n#\tLibrary/metadata/00/0000000000000000a100000000000000\n#\tLibrary/metadata/00/0000000000000000b000000000000000\n#\tLibrary/metadata/00/0000000000000000c000000000000000\n#\tLibrary/metadata/3c/3c0ad459c1534645b5d603b7cc258f97\n#\tLibrary/metadata/5f/5f32cd94baa94578a686d4b9d6b660f7\n#\tLibrary/metadata/73/739bbd9f364b4268874f9fd86ab3beef\n#\tLibrary/metadata/7c/7cbab2be89b54486bbd23a6fe637d30e\n#\tLibrary/metadata/80/80a3616ca19596e4da0f10f14d241e9f\n#\tLibrary/metadata/85/852e56802eb941638acbb491814497b0\n#\tLibrary/metadata/87/870353891bb340e2b2a9c8707e7419ba\n#\tLibrary/metadata/8e/8e0cd8ed44d4412cbe0642067abc9e44\n#\tLibrary/metadata/97/97decbdab0634cdd991f8d23ddf0dead\n#\tLibrary/metadata/ad/adebbd281f1a4ef3a30be7f21937e02f\n#\tLibrary/metadata/f5/f5f67c52d1564df4a8936ccd202a3bd8","distinct":false,"url":"https://api.github.com/repos/Nephet/DSI_2016/commits/2b9eb78f11b74f0102939c46dc32e4a7a3643ad7"},{"sha":"24b71909754225fe69d8b39b58fb3d6368e3b5cc","author":{"email":"8fb12cb93b0a4a7cf227f27fc9ed9d20dc7c5319@rubika-edu.com","name":"benoit vidot"},"message":"Modif MainMenu","distinct":false,"url":"https://api.github.com/repos/Nephet/DSI_2016/commits/24b71909754225fe69d8b39b58fb3d6368e3b5cc"},{"sha":"c192172c4bffc2503f7eb0d9a0e767acf58bf85c","author":{"email":"8fb12cb93b0a4a7cf227f27fc9ed9d20dc7c5319@rubika-edu.com","name":"benoit vidot"},"message":"Merge branch 'Flavien' of https://github.com/Nephet/DSI_2016 into Benoit\n\n# Conflicts:\n#\tLibrary/AssetImportState\n#\tLibrary/CurrentLayout.dwlt\n#\tLibrary/InspectorExpandedItems.asset\n#\tLibrary/assetDatabase3\n#\tLibrary/expandedItems\n#\tLibrary/metadata/00/00000000000000002000000000000000\n#\tLibrary/metadata/00/00000000000000003000000000000000\n#\tLibrary/metadata/00/00000000000000004000000000000000\n#\tLibrary/metadata/00/00000000000000004100000000000000\n#\tLibrary/metadata/00/00000000000000005000000000000000\n#\tLibrary/metadata/00/00000000000000005100000000000000\n#\tLibrary/metadata/00/00000000000000006000000000000000\n#\tLibrary/metadata/00/00000000000000006100000000000000\n#\tLibrary/metadata/00/00000000000000007000000000000000\n#\tLibrary/metadata/00/00000000000000007100000000000000\n#\tLibrary/metadata/00/00000000000000008000000000000000\n#\tLibrary/metadata/00/00000000000000008100000000000000\n#\tLibrary/metadata/00/00000000000000009000000000000000\n#\tLibrary/metadata/00/0000000000000000a000000000000000\n#\tLibrary/metadata/00/0000000000000000a100000000000000\n#\tLibrary/metadata/00/0000000000000000b000000000000000\n#\tLibrary/metadata/00/0000000000000000c000000000000000\n#\tLibrary/metadata/3c/3c0ad459c1534645b5d603b7cc258f97\n#\tLibrary/metadata/5f/5f32cd94baa94578a686d4b9d6b660f7\n#\tLibrary/metadata/73/739bbd9f364b4268874f9fd86ab3beef\n#\tLibrary/metadata/7c/7cbab2be89b54486bbd23a6fe637d30e\n#\tLibrary/metadata/80/80a3616ca19596e4da0f10f14d241e9f\n#\tLibrary/metadata/85/852e56802eb941638acbb491814497b0\n#\tLibrary/metadata/87/870353891bb340e2b2a9c8707e7419ba\n#\tLibrary/metadata/8e/8e0cd8ed44d4412cbe0642067abc9e44\n#\tLibrary/metadata/97/97decbdab0634cdd991f8d23ddf0dead\n#\tLibrary/metadata/ad/adebbd281f1a4ef3a30be7f21937e02f\n#\tLibrary/metadata/f5/f5f67c52d1564df4a8936ccd202a3bd8","distinct":true,"url":"https://api.github.com/repos/Nephet/DSI_2016/commits/c192172c4bffc2503f7eb0d9a0e767acf58bf85c"}]}