Merge

05b46512 · Tim Reiter · c18dcf06 · 05b46512 · 05b46512 · 05b46512
Commit 05b46512 authored Jun 05, 2015 by Tim Reiter
6 changed files
--- a/Assets/Prefabs/GameStateTracker.prefab
+++ b/Assets/Prefabs/GameStateTracker.prefab
--- a/Assets/Prefabs/GameStateTracker.prefab.meta
+++ b/Assets/Prefabs/GameStateTracker.prefab.meta
 fileFormatVersion: 2
 guid: 3d31e8f63f3ce8f44943e5e4cca3b056
-timeCreated: 1433457524
+timeCreated: 1433458736
 licenseType: Free
 NativeFormatImporter:
  userData: 

--- a/Assets/Prefabs/PortableFire.prefab
+++ b/Assets/Prefabs/PortableFire.prefab
--- a/Assets/Prefabs/Shield.prefab
+++ b/Assets/Prefabs/Shield.prefab
--- a/Assets/Prefabs/Shield.prefab.meta
+++ b/Assets/Prefabs/Shield.prefab.meta
 fileFormatVersion: 2
 guid: 8c880442b4c4b4240a660c8aa3dd4da4
-timeCreated: 1433458310
+timeCreated: 1433458676
 licenseType: Free
 NativeFormatImporter:
  userData: 

--- a/Assets/game.unity
+++ b/Assets/game.unity