summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE6
1 files changed, 5 insertions, 1 deletions
diff --git a/LICENSE b/LICENSE
index 9c2a00e4..8fae56be 100644
--- a/LICENSE
+++ b/LICENSE
@@ -165,7 +165,11 @@ legal@themanaworld.org
graphics/items/equipment/head/nohmask.png (LEGACY) (GPLv2) (-)
graphics/items/equipment/head/pinkiehat.png (LEGACY) (GPLv2) (-)
graphics/items/equipment/head/pumpkinhat.png (Modanung) (CC BY-SA 3.0) (-)
+<<<<<<< HEAD
graphics/items/equipment/head/rangerhat.png (LEGACY) (GPLv2) (-)
+=======
+ graphics/items/equipment/head/rangerhat.png (Pauan) (GPLv2) (-)
+>>>>>>> 2d0c4f74a7490f4d074cdf4774e279890f517925
graphics/items/equipment/head/rosehat.png (Nami, skipy) (GPLv2) (Alige, Micksha)
graphics/items/equipment/head/silkheadband.png (LEGACY) (GPLv2) (-)
graphics/items/equipment/head/standardheadband.png (LEGACY) (GPLv2) (-)
@@ -896,7 +900,7 @@ legal@themanaworld.org
graphics/sprites/equipment/head/pumpkinhat.png (Modanung) (CC BY-SA 3.0) (-)
graphics/sprites/equipment/head/purplemodel.png (Saulc) (GPLv2) (-)
graphics/sprites/equipment/head/rosehat.png (LEGACY) (GPLv2) (Micksha)
- graphics/sprites/equipment/head/rangerhat.png (LEGACY) (GPLv2) (Micksha)
+ graphics/sprites/equipment/head/rangerhat.png (Pauan) (GPLv2) (Micksha)
graphics/sprites/equipment/head/santabeardhat.png (LEGACY) (GPLv2) (-)
graphics/sprites/equipment/head/santahat.png (LEGACY) (GPLv2) (-)
graphics/sprites/equipment/head/silkheadband.png (LEGACY) (GPLv2) (-)