Assets/Resources · 665505282fd2d7e05868061acfc02a567609420b · gamejam-gpn15 / dyingIsMainstream · GitLab

History Find file

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

Name	Last commit	Last update
..
Prefabs		Loading commit data...
Levels.xml		Loading commit data...
Levels.xml.meta		Loading commit data...
Prefabs.meta		Loading commit data...