diff options
| author | Ledmitz <smoothshifter@tuta.io> | 2023-03-21 22:06:25 -0300 |
|---|---|---|
| committer | Ledmitz <smoothshifter@tuta.io> | 2023-03-21 22:06:25 -0300 |
| commit | 86b376f59c7a6d5c6f24f74f825dc8ab54c0494c (patch) | |
| tree | 813be522038bbbaad10b6104de96657619a401b0 /graphics/sprites/equipment | |
| parent | 968bdbae500eff84c63e3dd2548b89d416e10f09 (diff) | |
| parent | bd24b8a8168dc6b2747fc2c2d98e50742ce375e2 (diff) | |
| download | clientdata-floyd_book.tar.gz clientdata-floyd_book.tar.bz2 clientdata-floyd_book.tar.xz clientdata-floyd_book.zip | |
Conflict resolution 1floyd_book
Diffstat (limited to 'graphics/sprites/equipment')
| -rw-r--r-- | graphics/sprites/equipment/head/christmastree.png | bin | 1721 -> 4508 bytes |
| -rw-r--r-- | graphics/sprites/equipment/weapons/null.png | bin | 923 -> 143 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/graphics/sprites/equipment/head/christmastree.png b/graphics/sprites/equipment/head/christmastree.png Binary files differindex 1d8a5e8f..d459e956 100644 --- a/graphics/sprites/equipment/head/christmastree.png +++ b/graphics/sprites/equipment/head/christmastree.png diff --git a/graphics/sprites/equipment/weapons/null.png b/graphics/sprites/equipment/weapons/null.png Binary files differindex 0906ec03..cbf5dc3e 100644 --- a/graphics/sprites/equipment/weapons/null.png +++ b/graphics/sprites/equipment/weapons/null.png |
