jyapayne/DemonShanker2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolving conflicts.

Browse source
This commit is contained in:
shakurass 2014-04-26 13:38:34 -06:00
commit 6e96537b25
7 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Assets/Scripts/CameraController.cs.meta Normal file
View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ae2ca4205f0f47a4fa626bd81ae8c2da
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData: