--- deliantra/server/Changes	2009/01/25 17:36:42	1.338
+++ deliantra/server/Changes	2009/01/25 23:56:13	1.339
@@ -1,12 +1,46 @@
 Deliantra MORPG Server, Maps and Archetypes ChangeLog.
 Version numbers sort like decimal numbers.
 
+<<<<<<< Changes
+TODO: emergency swap mode is not working
+TODO: xs-warn doesn't end up in server log.
+TODO: 2008-07-13 00:41:27.8762 BUG: process_events(): removed object is on active list: {cnt:8720978,uuid:<1.37c8d364d>,name:"bomb",flags:[2,11],type:102}
+TODO: inscription cannot be readied.
+TODO: random destination transport may bring you tot nürnberg errornously, likely stoneville
+TODO: reasy_skill find traps does nto unapply the range slot item (bow)
+TODO: schmorp-neko-san force has sped zero but is on active lsit sometimes?
+TODO: worldmaps still get loaded on startup before the gridmap is ready
+
+TODO: strange rign oif acid artifact description/story looks weird.
+TODO: destry_inv() should destroy, drop_inv_to_ground method?
+TODO: no detah messages for arena anymore
+TODO: remove curse should *maybe* work on players themselves
+TODO: remove curse in glyph/rune doesn't have any effect?
+TODO: rewrite highscore code
+
+TODO: greeting message on what to do in dialog after race selection.
+TODO: health bars for earthwalls seem to start at 100% end die at 50%
+
+
+2009-01-23 07:55:29.4659 loading /opt/crossfire/share/deliantra-server/maps//mlab/cdcapart1.map (271878,0)
+2009-01-23 07:55:29.4712 object refering to nonexistant archetype 'stonefloorred2'.
+2009-01-23 07:55:29.4713 object refering to nonexistant archetype 'stonefloorred2'.
+2009-01-23 07:55:29.4714 object refering to nonexistant archetype 'stonefloorred2'.
+2009-01-23 07:55:29.4716 object refering to nonexistant archetype 'stonefloorred2'.
+2009-01-23 07:55:29.4716 object refering to nonexistant archetype 'stonefloorred2'.
+2009-01-23 07:55:29.4716 object refering to nonexistant archetype 'stonefloorred2'.
+
+	- convert me command from per-map to chat, which makes more sense, also
+          document it.
+
+=======
         - more than one spellbooks of same class can now be given
           in class selection.
         - adjusted the starting_spell.trs treasure list to the recent
           spell rebalancements.
         - the IRC gateway filters IRC colors now.
 
+>>>>>>> 1.338
 2.76 Sat Jan 17 08:36:51 CET 2009
 	- (arch) fix quiver of Holding Bolts.
         - applying unpaid items will now examine them.