--- deliantra/Deliantra-Client/Changes	2007/12/26 15:18:15	1.31
+++ deliantra/Deliantra-Client/Changes	2007/12/27 19:12:18	1.41
@@ -1,16 +1,32 @@
 Revision history for Perl extension CFPlus
 
-<<<<<<< Changes
-	- do not render some glyphs twice. doh.
-=======
-TODO: currently running at maximum refresh
-	- fixed unneccessary repeation when fireing in a direction
+0.9963
+	- improve interactivity by using a prepare, not an idle watcher,
+          for screen refreshes.
+        - limit the time spent in database handling, so we refresh the screen
+          even during ongoing heavy texture loading.
+        - load tile map at startup, not at connect time.
+        - tweak database accesses.
+        - widget protocol version 2, supports ui templates.
+        - increase horizontal padding for buttons a bit.
+
+0.9962 Thu Dec 27 14:29:02 CET 2007 (download.com only)
+	- changed minimum required resolution to 800x640.
+	- renamed perl module to Deliantra::Client.
+	- fixed unneccessary repetition when firing in a direction
           when 'only shift-up stops fire' is off.
-	- do not render all glyphs twice. doh.
->>>>>>> 1.30
-        - updated the dejavu fonts to version 2.22.
+	- do not render some glyphs twice. doh.
         - fix two problems that would cause endless
           refreshes even when idle (up to 60Hz).
+        - optimise refresh strategy to not refresh more often than 60hz,
+          even if it means to delay updates up to 1/60th of a second.
+        - updated the dejavu fonts to version 2.22.
+        - switch from Crossfire to Deliantra module.
+        - switch from ~/.crossfire to ~/.deliantra,
+          move database from cf to deliantra at startup.
+        - fix some opengl races that could freeze deliantra during shutdowns.
+        - moved client-specific modules into a private subdirectory.
+        - moved client-specific resources into a private subdirectory.
 
 0.9961 Tue Dec 25 20:22:51 CET 2007
 	- fix texture-reload problems when changing resolutions