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

Browse Source

Conflicts:
	FricaDeGaze/Library/CurrentLayout.dwlt
	FricaDeGaze/Library/assetDatabase3

...

This commit is contained in:

ligiatosa

2015-01-14 00:00:06 +02:00

parent a699870ad0 65077867bf

commit 3158ad6243

12 changed files with 254 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

FricaDeGaze/Library/expandedItems

Binary file not shown.

BIN

FricaDeGaze/Library/guidmapper

Binary file not shown.

BIN

FricaDeGaze/Library/metadata/03/03f6c766f65e2304c981740ca3494e65 Normal file

Binary file not shown.

BIN

FricaDeGaze/Library/metadata/0c/0c1f4c02f6957274d9ac61d1e9b914b8 Normal file

Binary file not shown.

BIN

FricaDeGaze/Library/metadata/d8/d87acaaacd69c38439d8be03d44fd932

Binary file not shown.