Merge branch 'master' of shard.imon.nu:Assets

Browse Source

Conflicts:
	Models/Placeholders/PhysicsTest/Cube.mtl
	Models/TestScene3/testScene.mtl
	Models/TestScene3/testScene.obj

...

This commit is contained in:

Tleety

2014-05-20 03:33:05 +02:00

parent 07100ef6eb 6cc38589ed

commit 836ffcb9de

254 changed files with 446155 additions and 429761 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

Textures/Sprites/Dust.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 163 B