summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorMicksha <Micksha@users.noreply.github.com>2018-09-10 13:08:06 +0200
committerMicksha <Micksha@users.noreply.github.com>2018-11-06 12:53:40 +0100
commit44f319744c1a37cd4b5b48b4e58d27057efa6700 (patch)
tree406d8f92db1982a01e67b7eb51cf3995ad3c3c5c /graphics
parent736e28d4aa23514e495ef12af2df0594e5c050a0 (diff)
downloadclientdata-44f319744c1a37cd4b5b48b4e58d27057efa6700.tar.gz
clientdata-44f319744c1a37cd4b5b48b4e58d27057efa6700.tar.bz2
clientdata-44f319744c1a37cd4b5b48b4e58d27057efa6700.tar.xz
clientdata-44f319744c1a37cd4b5b48b4e58d27057efa6700.zip
add a bunch of hurns NPCs - most of them LEGACY versions, to be changed one by one
Diffstat (limited to 'graphics')
-rw-r--r--graphics/sprites/npcs/xml/richard.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/graphics/sprites/npcs/xml/richard.xml b/graphics/sprites/npcs/xml/richard.xml
index 28a701fa..d0765ba4 100644
--- a/graphics/sprites/npcs/xml/richard.xml
+++ b/graphics/sprites/npcs/xml/richard.xml
@@ -1,9 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
+<<<<<<< f542316432d2f4aad709c04d577ed91b3ea6e392
<<<<<<< 21c4c83ea02e1292391aaa7fdbaf3dc3202a100a
<!-- Author: Micksha
=======
<!-- Author: Reid
>>>>>>> Add the first few npcs: old Koga, Lumberjack, Richard.
+=======
+<!-- Author: Micksha
+>>>>>>> add a bunch of hurns NPCs - most of them LEGACY versions, to be changed one by one
Copyright (C) 2015 Evol Online -->
<sprite>