--- deliantra/server/Changes	2008/04/20 18:27:36	1.99
+++ deliantra/server/Changes	2008/04/20 18:48:51	1.100
@@ -4,6 +4,7 @@
       a while (used up?) they seem to be gone from the inv but the client doesn't know about that.
 TODO: dragons should not be able to change their title via the settings tab in playerbook
 
+2.51  
 	- properly link against libgthread as that is needed to make the slice
           allocator thread-safe.
 	- support perls not compiled with 64 bit support (though this is not a
@@ -16,9 +17,16 @@
         - implement an "incremental garbage collector" for archetypes.
         - (maps, arch) the scorn go club was founded!
         - (arch) do no longer support player abilities, they didn't work anyways.
+<<<<<<< Changes
+        - (arch) the alchemy spell is now of the alchemy spell school, which
+          became a real spell-class.
+        - examine comamnd now uses the examine infobox.
+        - enable slice allocator again, was accidentally disabled in 2.5.
+=======
         - (arch) the alchemy spell is now of the alchemy spell school.
         - (arch) the alchemist class now get an alchemy spell book for new characters.
         - enable slice allocator again.
+>>>>>>> 1.99
         - implement optional free memory poisoning.
 
 2.5  Wed Apr 16 15:06:53 CEST 2008