--- deliantra/Deliantra-Client/Changes	2008/06/24 21:44:49	1.90
+++ deliantra/Deliantra-Client/Changes	2008/07/07 05:02:03	1.92
@@ -2,12 +2,11 @@
 
 TODO: fix unpack "n" fpr signed updspell and addspell values.
 TODO: make sure SRV lookups are working.
+	- added a dummy "package Deliantra::Client" to bin/deliantra, as
+          cpan stupidly cannot install distributions by name.
 	- convert to new non-blocking API.
-<<<<<<< Changes
         - support IPv6 server connections.
-=======
         - the chat tabs now have tooltips again.
->>>>>>> 1.89
 
 0.9972 Thu May 22 22:45:01 CEST 2008
 	- save all map changes in map cache, not just the current map (this fixes