summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormc_cameri <mc_cameri@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-19 14:53:44 +0000
committermc_cameri <mc_cameri@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-19 14:53:44 +0000
commit3a129802e4015d81507345d986f50e383f04aa1f (patch)
tree724b0053bfbc7b92ce088f41b7e540c467e7b514
parent40fc724fe77bfc27b2d92ee78f9cd665cb7202f1 (diff)
downloadhercules-3a129802e4015d81507345d986f50e383f04aa1f.tar.gz
hercules-3a129802e4015d81507345d986f50e383f04aa1f.tar.bz2
hercules-3a129802e4015d81507345d986f50e383f04aa1f.tar.xz
hercules-3a129802e4015d81507345d986f50e383f04aa1f.zip
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@639 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog.txt4
1 files changed, 0 insertions, 4 deletions
diff --git a/Changelog.txt b/Changelog.txt
index 282d8888d..6836b4a5b 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -18,10 +18,6 @@ Date Added
prep for unleasing it on the sql using public [MouseJstr]
* Fixed some SQL queries crashing char server [davidsiaw]
* Added several PID GM commands, thanks to Dino9021 [nsstrunks]
-
-12/18
-=======
->>>>>>> .r637
* Storage was merging items incorrectly [Mousejstr]
* eliminated a uninitialized var when using afm maps [MouseJstr]
* Added concept of dirty storage to reduce saves/load