--- deliantra/Deliantra-Client/Changes	2008/03/30 11:31:08	1.73
+++ deliantra/Deliantra-Client/Changes	2008/05/08 18:58:55	1.82
@@ -1,6 +1,22 @@
 Revision history for Perl extension Deliantra::Client
 
+<<<<<<< Changes
+TODO: close contaienr on disocnnect
+=======
+0.9972
+	- added default (0) for the shift_fire_stop setting
+>>>>>>> 1.81
+	- write client.cf in pretty-printed-json.
+
+0.9971 Mon May  5 21:37:33 CEST 2008
+	- reverse order of items in floorbox.
+	- sort right side of inventory by floor order.
+        - make messages window always visible.
+	- fix stat tooltips by not lowercasing keywords in pod2wiki.
+	- fix longstanding bug where the stats tab would be removed during chargen.
+        - fix menu alignment.
 	- change podwiki format to be slightly more generic.
+	- ignore pseudo-items in floorbox, only show in inventory.
 
 0.9970 Sun Mar 30 13:30:47 CEST 2008
 	- fix a bug in tile id allocation, the effect of this bug