Commit Graph

17 Commits

Author SHA1 Message Date
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
ligiatosa
0ea76a156f - 2015-01-14 20:11:38 +02:00
2a8d2ffe51 Fixed everything, added sound, etc. 2015-01-14 12:31:17 +02:00
ligiatosa
26b85818a5 AddSpider.cs 2015-01-14 05:29:40 +02:00
ligiatosa
96c75a01fc Revert "-"
This reverts commit 9819dda592.

Conflicts:
	FricaDeGaze/Library/CurrentLayout.dwlt
	FricaDeGaze/Library/assetDatabase3
	FricaDeGaze/Library/expandedItems
2015-01-14 02:48:35 +02:00
ligiatosa
9819dda592 - 2015-01-14 00:44:40 +02:00
ligiatosa
39d637754d - 2015-01-14 00:39:51 +02:00
ligiatosa
86d82e23e5 Sincronizarea dupa reimport 2015-01-14 00:35:21 +02:00
ligiatosa
ad07448ae8 - 2015-01-14 00:20:48 +02:00
ligiatosa
f8539fd0a2 - 2015-01-14 00:11:44 +02:00
ligiatosa
152f841cb8 m 2015-01-14 00:08:32 +02:00
ligiatosa
705d7f649c Masa 2015-01-14 00:04:38 +02:00
ligiatosa
a699870ad0 Script pt miscare + masa 2015-01-13 23:58:29 +02:00
ligiatosa
1a8486bc4a Am adaugat ceva miscare 2015-01-13 23:11:10 +02:00
ligiatosa
6c63965bd4 Adaugare masa 2015-01-13 23:03:04 +02:00
ligiatosa
432c84802c -- 2015-01-13 22:28:42 +02:00
cdf3f87e4e Initial commit 2015-01-08 10:57:40 +02:00