Upload02
Upload2
Merge branch 'master' of https://github.com/June-min/wiper

Conflicts:
	Proto/Assembly-CSharp-Editor-vs.csproj
	Proto/Assembly-CSharp-Editor.csproj
	Proto/Assembly-CSharp-vs.csproj
	Proto/Assembly-CSharp.csproj
	Proto/Assembly-UnityScript-vs.unityproj
	Proto/Assembly-UnityScript.unityproj
	Proto/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Proto/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Proto/Library/ScriptAssemblies/Assembly-CSharp.dll
	Proto/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Proto/Library/ScriptAssemblies/Assembly-UnityScript.dll
	Proto/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Proto/Library/assetDatabase3
	Proto/Library/guidmapper
	Proto/Library/metadata/1a/1ae03f0ab0e864a2a819ca64793dad60
	Proto/Library/metadata/94/94a69b237a5614fdfb6714f578de3724
	Proto/Library/metadata/a0/a0305ffe24d164eb4adc94585f3f8866
	Proto/Proto-csharp.sln
	Proto/Proto.sln

Proto/Temp/StagingArea/Untitled.app/Contents/Data/Managed/Assembly-CShar
p.dll

Proto/Temp/StagingArea/Untitled.app/Contents/Data/Managed/Assembly-Unity
Script.dll

Proto/Temp/StagingArea/Untitled.app/Contents/Data/PlayerConnectionConfig
File
	Proto/Temp/StagingArea/Untitled.app/Contents/Data/level0
	Proto/Temp/StagingArea/Untitled.app/Contents/Data/level1
	Proto/Temp/StagingArea/Untitled.app/Contents/Data/mainData
	Proto/Temp/StagingArea/Untitled.app/Contents/Data/resources.assets
	Proto/Temp/StagingArea/Untitled.app/Contents/Data/sharedassets0.assets
	Proto/Temp/StagingArea/Untitled.app/Contents/Data/sharedassets1.assets
	Proto/Temp/StagingArea/Untitled.app/Contents/Data/sharedassets2.assets
	Proto/Temp/UnityTempFile-132860664282e40e081a2f0ceb2c0bbe
	Proto/Temp/UnityTempFile-3e4949e8104c44156ba3285f7d109333
	Proto/Temp/UnityTempFile-5f99e4233ff5b418c855e749af7b8874
	Proto/Temp/UnityTempFile-70034027bfa2249df9def23983db271d
	Proto/Temp/UnityTempFile-bb282432cd68648198c9edc680056aa3
	Proto/Temp/__BuildPlayer Backupscene