summaryrefslogtreecommitdiff
path: root/emotes.xml
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2012-05-23 22:37:06 +0200
committerReid <reidyaro@gmail.com>2012-05-23 22:37:06 +0200
commitfff9c1f556e21115d07a7ecb2faa6c117e2adc4f (patch)
treeacb9d92b831296b28f9a367e5d112dbc06b732ad /emotes.xml
parent6f2dbcf04e05fb29577f46f1a8081cf82fffd8f3 (diff)
downloadclientdata-fff9c1f556e21115d07a7ecb2faa6c117e2adc4f.tar.gz
clientdata-fff9c1f556e21115d07a7ecb2faa6c117e2adc4f.tar.bz2
clientdata-fff9c1f556e21115d07a7ecb2faa6c117e2adc4f.tar.xz
clientdata-fff9c1f556e21115d07a7ecb2faa6c117e2adc4f.zip
Correct merge problems on npcs.xml .
Diffstat (limited to 'emotes.xml')
0 files changed, 0 insertions, 0 deletions