--- deliantra/server/Changes	2009/10/11 05:43:35	1.420
+++ deliantra/server/Changes	2009/10/12 04:02:16	1.424
@@ -47,7 +47,10 @@
         - fix an exploit where inscription/marking runes could execute arbitrary code.
         - examining an object now dumps the serialised object form when the user
           is a wizard (wizlook).
+        - altars no longer accept unpaid items.
         - party spells didn't work all that well.
+        - added complex object matching framework (cf::match), and make altars
+          and pedestals use it.
         - display the duration of change_ability spells when examining them
           (missing: protection spells, but they are a hack...).
         - improve effectiveness of special foods created by woodsman skill,
@@ -55,6 +58,7 @@
         - fix a minor cfpod formatting bug.
         - do not talk about the hintmode so much - die-hards are expected to find
           the hintmode setting on the settings page.
+        - IPO no longer lies about prices; prices tweaked.
         - enable the object loader to also dump archetypes.
         - (maps) fix guild teleporters to Pupland Terminal.
         - (maps) put the trapdoor above the floor in sisters/necro_ruins1.
@@ -71,7 +75,13 @@
         - (arch) add name_pl fields and documentation for building materials.
         - (maps) random fountains no longer generate permanent stat increases.
         - fix transmutation alchemy.
+<<<<<<< Changes
+        - enable the object loader to also dump archetypes.
+        - speed up many frequently-invoked C->perl callbacks.
+=======
         - added complex object matching framework, to be used in altars and the like.
+        - identified skill-tools show what skill they grant.
+>>>>>>> 1.423
 
 2.80 Tue Sep 15 20:22:31 CEST 2009
 	- fix the "screen stays black on login" bug and remove debug instrumentation