mirror of
https://github.com/EQEmu/Server.git
synced 2025-12-11 21:01:29 +00:00
Changelog fix.
This commit is contained in:
parent
f5e58e0125
commit
09df77b56e
@ -1,15 +1,14 @@
|
||||
EQEMu Changelog (Started on Sept 24, 2003 15:50)
|
||||
-------------------------------------------------------
|
||||
<<<<<<< HEAD
|
||||
|
||||
== 03/18/2013 ==
|
||||
Bad_Captain: Fixed zone crash due to merc focus effects & tribute.
|
||||
Bad_Captain: Fixed merc aggro issues when client in melee range & spell recast timers.
|
||||
Bad_Captain: Added melee DPS spells/disciplines & support.
|
||||
=======
|
||||
|
||||
== 03/17/2013 ==
|
||||
Secrets: Fixed that pesky merc memleak.
|
||||
Secrets: Bit of code cleanup regarding mercs.
|
||||
>>>>>>> 5c9f2c0d50ca6920305999d9d3e1127be44238a4
|
||||
|
||||
== 03/15/2013 ==
|
||||
Derision: RoF: Added ENCODE for Resurrect_struct (Accepting a rez should now work).
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user