Assets/Prefabs/Player.prefab · 3f2a02afdc1c937477eaa2d3bd15787e7af6b3f2 · gamejam-gpn15 / dyingIsMainstream · GitLab

History Permalink

Merge branch 'master' of ssh://git.breab.org:2222/gamejam-gpn15/dyingIsMainstream · f5910d4e
Tim Reiter authored Jun 04, 2015
```
Conflicts:
	Assets/Prefabs/Player.prefab
	Assets/Scripts/PlayerControl.cs
	Assets/game.unity
```
f5910d4e

Player.prefab 11.2 KB

Download (11.2 KB)