ligiatosa f319d12e88 Merge branch 'master' of https://github.com/chibicitiberiu/frica-de-gaze ...

Conflicts:
	FricaDeGaze/FricaDeGaze-csharp.sln
	FricaDeGaze/FricaDeGaze.sln
	FricaDeGaze/Library/CurrentLayout.dwlt
	FricaDeGaze/Library/CurrentMaximizeLayout.dwlt

2015-01-14 20:12:41 +02:00

..

Assets

Fixed everything, added sound, etc.

2015-01-14 12:31:17 +02:00

FricaDeGaze_Data

Fixed everything, added sound, etc.

2015-01-14 12:31:17 +02:00

Library

Merge branch 'master' of https://github.com/chibicitiberiu/frica-de-gaze

2015-01-14 20:12:41 +02:00

ProjectSettings

…

Assembly-CSharp-firstpass-vs.csproj

Fixed everything, added sound, etc.

2015-01-14 12:31:17 +02:00

Assembly-CSharp-firstpass.csproj

Fixed everything, added sound, etc.

2015-01-14 12:31:17 +02:00

Assembly-CSharp-vs.csproj

Fixed everything, added sound, etc.

2015-01-14 12:31:17 +02:00

Assembly-CSharp.csproj

Fixed everything, added sound, etc.

2015-01-14 12:31:17 +02:00

Assembly-UnityScript-firstpass-vs.unityproj

Fixed everything, added sound, etc.

2015-01-14 12:31:17 +02:00

Assembly-UnityScript-firstpass.unityproj

Fixed everything, added sound, etc.

2015-01-14 12:31:17 +02:00

FricaDeGaze-csharp.sln

Merge branch 'master' of https://github.com/chibicitiberiu/frica-de-gaze

2015-01-14 20:12:41 +02:00

FricaDeGaze.exe

…

FricaDeGaze.sln

Merge branch 'master' of https://github.com/chibicitiberiu/frica-de-gaze

2015-01-14 20:12:41 +02:00

FricaDeGaze.userprefs

Fixed everything, added sound, etc.

2015-01-14 12:31:17 +02:00