diff options
| author | Ali-G <gauvain.dauchy@free.fr> | 2011-06-15 17:09:41 +0200 |
|---|---|---|
| committer | Ali-G <gauvain.dauchy@free.fr> | 2011-06-15 17:09:41 +0200 |
| commit | e82b0f1c1a15ba1aad991350130f3d6dd9ead7e3 (patch) | |
| tree | 6cb9178035e1775b74bf74532bdd439f905ef1f5 /graphics/tiles | |
| parent | 727b118e90f8ff15dff948c74b4fcf05c0599f5f (diff) | |
| parent | 3e565300a297a7f88b3fe05432cd7eba91020b91 (diff) | |
| download | clientdata-e82b0f1c1a15ba1aad991350130f3d6dd9ead7e3.tar.gz clientdata-e82b0f1c1a15ba1aad991350130f3d6dd9ead7e3.tar.bz2 clientdata-e82b0f1c1a15ba1aad991350130f3d6dd9ead7e3.tar.xz clientdata-e82b0f1c1a15ba1aad991350130f3d6dd9ead7e3.zip | |
Merge branch 'master' of git://gitorious.org/+dm-developers/tmw/rossy-client
Conflicts:
monsters.xml
Diffstat (limited to 'graphics/tiles')
| -rw-r--r-- | graphics/tiles/Woodland_village_x2.png | bin | 21769 -> 21759 bytes |
| -rwxr-xr-x | graphics/tiles/thermin-cave.png | bin | 0 -> 23884 bytes |
| -rwxr-xr-x | graphics/tiles/thermin-town.png | bin | 0 -> 91358 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/graphics/tiles/Woodland_village_x2.png b/graphics/tiles/Woodland_village_x2.png Binary files differindex e0f067a0..9d853b0b 100644 --- a/graphics/tiles/Woodland_village_x2.png +++ b/graphics/tiles/Woodland_village_x2.png diff --git a/graphics/tiles/thermin-cave.png b/graphics/tiles/thermin-cave.png Binary files differnew file mode 100755 index 00000000..2fa926c5 --- /dev/null +++ b/graphics/tiles/thermin-cave.png diff --git a/graphics/tiles/thermin-town.png b/graphics/tiles/thermin-town.png Binary files differnew file mode 100755 index 00000000..34bc9a08 --- /dev/null +++ b/graphics/tiles/thermin-town.png |
