diff options
| author | Jessica Tölke <jtoelke@gmx.de> | 2013-08-25 17:21:15 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@gmx.de> | 2013-08-25 17:21:15 +0200 |
| commit | 9b8362e5767b9b0fb4251c16c80669b288f06648 (patch) | |
| tree | 4b78772e1b17ce69cd877f49edf3d2a31b4d9920 /tilesets/desert3.tsx | |
| parent | bbed5a765c152fee8a4ed8adc78423d9737c4d46 (diff) | |
| parent | 5409675d5d3cba9f4a55ca6a783d038eb69f9ccc (diff) | |
| download | clientdata-9b8362e5767b9b0fb4251c16c80669b288f06648.tar.gz clientdata-9b8362e5767b9b0fb4251c16c80669b288f06648.tar.bz2 clientdata-9b8362e5767b9b0fb4251c16c80669b288f06648.tar.xz clientdata-9b8362e5767b9b0fb4251c16c80669b288f06648.zip | |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
monsters.xml
Diffstat (limited to 'tilesets/desert3.tsx')
| -rw-r--r-- | tilesets/desert3.tsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tilesets/desert3.tsx b/tilesets/desert3.tsx index 138f2dc7..8ae2e2e3 100644 --- a/tilesets/desert3.tsx +++ b/tilesets/desert3.tsx @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> <tileset name="desert3" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/desert3.png" width="512" height="256"/> + <image source="../graphics/tiles/desert3.png" width="320" height="256"/> </tileset> |