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

..

metadata

Fixed everything, added sound, etc.

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

ScriptAssemblies

Fixed everything, added sound, etc.

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

AnnotationManager

Initial commit

2015-01-08 10:57:40 +02:00

assetDatabase3

Fixed everything, added sound, etc.

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

AssetImportState

Initial commit

2015-01-08 10:57:40 +02:00

AssetServerCacheV3

Script pt miscare + masa

2015-01-13 23:58:29 +02:00

AssetVersioning.db

Initial commit

2015-01-08 10:57:40 +02:00

BuildPlayer.prefs

Initial commit

2015-01-08 10:57:40 +02:00

BuildSettings.asset

Initial commit

2015-01-08 10:57:40 +02:00

CurrentLayout.dwlt

-

2015-01-14 20:11:38 +02:00

CurrentMaximizeLayout.dwlt

-

2015-01-14 20:11:38 +02:00

EditorUserBuildSettings.asset

Fixed everything, added sound, etc.

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

EditorUserSettings.asset

Initial commit

2015-01-08 10:57:40 +02:00

expandedItems

Fixed everything, added sound, etc.

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

FailedAssetImports.txt

Initial commit

2015-01-08 10:57:40 +02:00

guidmapper

Fixed everything, added sound, etc.

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

InspectorExpandedItems.asset

Fixed everything, added sound, etc.

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

MonoManager.asset

Initial commit

2015-01-08 10:57:40 +02:00

ProjectSettings.asset

Initial commit

2015-01-08 10:57:40 +02:00

ScriptMapper

Initial commit

2015-01-08 10:57:40 +02:00

ShaderCache.db

Initial commit

2015-01-08 10:57:40 +02:00