Merge branch 'master' of https://github.com/arg-games/ld31

Browse source

Conflicts:
	src/entities/tile.coffee

...

This commit is contained in:

Ruben Müller 2014-12-06 18:20:29 +01:00

parent 2b6fa18b02 15d6f375cd

commit 0e88f82bb2

2 changed files with 0 additions and 0 deletions

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

Show stats Download patch file Download diff file Expand all files Collapse all files

BIN

public/images/Thumbs.db Normal file

View file

Binary file not shown.

BIN

public/images/entities.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 344 B After Width:  |  Height:  |  Size: 371 B