Assets · ca2eb01f25073945edf5df3d7e3900e19cf2d583 · gamejam-gpn15 / dyingIsMainstream · GitLab

History Find file

Merge branch 'master' of ssh://git.breab.org:2222/gamejam-gpn15/dyingIsMainstream · ca2eb01f
Alisa Jung authored Jun 04, 2015
```
Conflicts:
	Assets/Prefabs/Player.prefab
	Assets/Prefabs/Trap.prefab
	Assets/Scripts/PlayerControl.cs
```
ca2eb01f

Name	Last commit	Last update
..
Prefabs		Loading commit data...
Scripts		Loading commit data...
Sprites		Loading commit data...
Prefabs.meta		Loading commit data...
Scripts.meta		Loading commit data...
Sprites.meta		Loading commit data...
game.unity		Loading commit data...
game.unity.meta		Loading commit data...