Assets/Scripts/Menu.cs · 7d9c2dd3a38c3d608517eb7ab6331f38cf300dc1 · gamejam-gpn15 / dyingIsMainstream · GitLab

Blame History Permalink

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

Menu.cs 5.39 KB