Merge branch 'master' of ssh://git.breab.org:2222/gamejam-gpn15/dyingIsMainstream

9b84ba56 · Tim Reiter · c5084ce9 · 39e9d223 · 9b84ba56 · 9b84ba56
Commit 9b84ba56 authored Jun 04, 2015 by Tim Reiter
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

Player.prefab Assets/Prefabs/Player.prefab +0 -0

Player.prefab.meta Assets/Prefabs/Player.prefab.meta +8 -0

No files found.
--- a/Assets/Prefabs/Player.prefab
+++ b/Assets/Prefabs/Player.prefab
--- a/Assets/Prefabs/Player.prefab.meta
+++ b/Assets/Prefabs/Player.prefab.meta
+fileFormatVersion: 2
+guid: 561019a7f49ce2d40b44edc6a0980c4a
+timeCreated: 1433442216
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: