diff options
author | Micksha <Micksha@users.noreply.github.com> | 2018-07-20 13:09:52 +0200 |
---|---|---|
committer | Micksha <Micksha@users.noreply.github.com> | 2018-11-06 12:52:13 +0100 |
commit | 736e28d4aa23514e495ef12af2df0594e5c050a0 (patch) | |
tree | fd9818c9b22400edbcf792ffad43ef267567be56 /graphics/sprites/npcs/xml/richard.xml | |
parent | 63d7f303cd8795153a639bab7dbf75c7201d20c2 (diff) | |
download | clientdata-736e28d4aa23514e495ef12af2df0594e5c050a0.tar.gz clientdata-736e28d4aa23514e495ef12af2df0594e5c050a0.tar.bz2 clientdata-736e28d4aa23514e495ef12af2df0594e5c050a0.tar.xz clientdata-736e28d4aa23514e495ef12af2df0594e5c050a0.zip |
Add the first few npcs: old Koga, Lumberjack, Richard.
Diffstat (limited to 'graphics/sprites/npcs/xml/richard.xml')
-rw-r--r-- | graphics/sprites/npcs/xml/richard.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/graphics/sprites/npcs/xml/richard.xml b/graphics/sprites/npcs/xml/richard.xml index d59cfe9d..28a701fa 100644 --- a/graphics/sprites/npcs/xml/richard.xml +++ b/graphics/sprites/npcs/xml/richard.xml @@ -1,5 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> +<<<<<<< 21c4c83ea02e1292391aaa7fdbaf3dc3202a100a <!-- Author: Micksha +======= +<!-- Author: Reid +>>>>>>> Add the first few npcs: old Koga, Lumberjack, Richard. Copyright (C) 2015 Evol Online --> <sprite> |