diff options
| author | HoraK-FDF <horak-fdf@web.de> | 2023-06-01 06:54:56 +0000 |
|---|---|---|
| committer | HoraK-FDF <horak-fdf@web.de> | 2023-06-01 06:54:56 +0000 |
| commit | 5ce318195ff0b976a78bc708c5910069d4fa4957 (patch) | |
| tree | 79d626fadbd402c0f43e5493358d3bee6339b8e8 /graphics/sprites/icons/spell-cooldown-upmarmu.png | |
| parent | 92b95e0fa66720c9bf52b347830567355cf8630d (diff) | |
| parent | 4660621d40af1a1342fb3a2900ac96f21bb6b88f (diff) | |
| download | clientdata-5ce318195ff0b976a78bc708c5910069d4fa4957.tar.gz clientdata-5ce318195ff0b976a78bc708c5910069d4fa4957.tar.bz2 clientdata-5ce318195ff0b976a78bc708c5910069d4fa4957.tar.xz clientdata-5ce318195ff0b976a78bc708c5910069d4fa4957.zip | |
Merge branch 'master' into 'items_descriptions'
# Conflicts:
# items.xml
# items/equip-1hand/item571_Setzer.xml
# items/equip-1hand/item578_SandCutter.xml
# items/equip-head/item5130_Phylactery.xml
Diffstat (limited to 'graphics/sprites/icons/spell-cooldown-upmarmu.png')
| -rw-r--r-- | graphics/sprites/icons/spell-cooldown-upmarmu.png | bin | 0 -> 4851 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/graphics/sprites/icons/spell-cooldown-upmarmu.png b/graphics/sprites/icons/spell-cooldown-upmarmu.png Binary files differnew file mode 100644 index 00000000..231e9599 --- /dev/null +++ b/graphics/sprites/icons/spell-cooldown-upmarmu.png |