diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-12-28 22:54:02 +0000 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-12-28 22:54:02 +0000 |
commit | 30c26cc0e1c09c579fb8575e4d4bafd418e1463e (patch) | |
tree | a17a31a1d30a17212969f5e049777c460f451226 | |
parent | 5598bed42b6b8a04f8faedb2e75b4ee7479b242a (diff) | |
download | manaserv-30c26cc0e1c09c579fb8575e4d4bafd418e1463e.tar.gz manaserv-30c26cc0e1c09c579fb8575e4d4bafd418e1463e.tar.bz2 manaserv-30c26cc0e1c09c579fb8575e4d4bafd418e1463e.tar.xz manaserv-30c26cc0e1c09c579fb8575e4d4bafd418e1463e.zip |
Whoops, messed up the merge a tiny bit.
-rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -72,7 +72,6 @@ Added unregistering, checking on character's name and email length support. Also made some little tweaks. ->>>>>>> 1.25 2005-12-10 Yohann Ferreira <bertram@cegetel.net> * src/dalstorage.cpp: Fixed the buggy part of getAccount() |