summaryrefslogtreecommitdiff
path: root/Changelog.txt
diff options
context:
space:
mode:
authormc_cameri <mc_cameri@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-14 01:14:14 +0000
committermc_cameri <mc_cameri@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-14 01:14:14 +0000
commit30217193806701eb2e6159359f14bf9658d8a668 (patch)
tree87375178f757d4325e8cb58085a8e26290be2b0a /Changelog.txt
parent4aee20b0e1fdfb23d9336cea77a0985e463ea081 (diff)
downloadhercules-30217193806701eb2e6159359f14bf9658d8a668.tar.gz
hercules-30217193806701eb2e6159359f14bf9658d8a668.tar.bz2
hercules-30217193806701eb2e6159359f14bf9658d8a668.tar.xz
hercules-30217193806701eb2e6159359f14bf9658d8a668.zip
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@567 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'Changelog.txt')
-rw-r--r--Changelog.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/Changelog.txt b/Changelog.txt
index af2df756c..58cf88067 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -32,7 +32,6 @@ Date Added
rollback - fix by Freya [celest]
* Removed 'type' paramater from pc_unequipitem to use 'flag' instead[celest]
* Moved unequip checking code from clif.c to pc.c [celest]
->>>>>>> .r565
* Replaced many printf's in map-server with _ShowMessage(). [MC Cameri]
* Skill timers for skills with id's higher then 450 were
corrupting memory [MouseJstr]