pacifistArchetype
Merge branch 'master' of github.com:saotele2/shooter

Conflicts:
	shooter/Assembly-UnityScript.pidb
	shooter/Library/assetDatabase3
	shooter/Library/guidmapper
Merge branch 'master' of github.com:saotele2/shooter

Conflicts:
	shooter/Assembly-CSharp-firstpass.pidb
	shooter/Assembly-UnityScript-Editor.pidb
	shooter/Assembly-UnityScript-firstpass.pidb
	shooter/Assembly-UnityScript.pidb
	shooter/Library/assetDatabase3
Смёрджился с Сашей
0