Merge branch 'master' of manuel-voegele.de:inf3

Browse Source

...

This commit is contained in:

Wafa Sadri

2014-05-08 22:03:29 +02:00

parent 8896dbee09 c58763e859

commit 44770bb78c

4 changed files with 20 additions and 13 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

textures/bow-and-arrow.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.8 KiB After Width:  |  Height:  |  Size: 3.9 KiB

BIN

textures/wall.jpg

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 17 KiB After Width:  |  Height:  |  Size: 6.6 KiB

BIN

textures/water.jpg

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 9.9 KiB After Width:  |  Height:  |  Size: 6.2 KiB