diff options
author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-08-19 02:48:23 +0200 |
---|---|---|
committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-08-19 02:48:23 +0200 |
commit | a4d0b4d6e0360f09b1f01ec59f548cdb297ebd4c (patch) | |
tree | 3ec5f5d2452205259789a5106df53c0002a586b8 /example/clientdata/graphics/sprites/equipment/feet/boots-female.png | |
parent | 70f3c0e3d530304b1b1162b1bdc6c1177522b7ff (diff) | |
parent | 2a581a0f65f4a381a76590be0f8a6e1048347177 (diff) | |
download | manaserv-a4d0b4d6e0360f09b1f01ec59f548cdb297ebd4c.tar.gz manaserv-a4d0b4d6e0360f09b1f01ec59f548cdb297ebd4c.tar.xz manaserv-a4d0b4d6e0360f09b1f01ec59f548cdb297ebd4c.zip |
Merge git://gitorious.org/~bertram/mana/manaserv-equipment-fix into equipment-fix
Conflicts:
example/serverdata/scripts/maps/desert.lua
Diffstat (limited to 'example/clientdata/graphics/sprites/equipment/feet/boots-female.png')
-rw-r--r-- | example/clientdata/graphics/sprites/equipment/feet/boots-female.png | bin | 0 -> 8734 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/example/clientdata/graphics/sprites/equipment/feet/boots-female.png b/example/clientdata/graphics/sprites/equipment/feet/boots-female.png Binary files differnew file mode 100644 index 0000000..ba98432 --- /dev/null +++ b/example/clientdata/graphics/sprites/equipment/feet/boots-female.png |