--- deliantra/Deliantra-Client/Changes	2007/12/05 19:44:10	1.18
+++ deliantra/Deliantra-Client/Changes	2007/12/26 15:18:15	1.31
@@ -1,7 +1,37 @@
 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
+          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.
+        - fix two problems that would cause endless
+          refreshes even when idle (up to 60Hz).
+
+0.9961 Tue Dec 25 20:22:51 CET 2007
+	- fix texture-reload problems when changing resolutions
+          by forcing the reuse of the same texture name.
+        - save and restore glyph cache textures when changing resolutions.
+
+0.9960 Tue Dec 25 10:38:17 CET 2007
+	- fixed item animation by taking advantage of ev_periodic.
+	- document KP+ better.
+        - update to EV 2.0.
+        - do not crash when an invisible widget wants its global
+          coordinate or vice versa.
+        - further optimise face loading from database.
+
+0.9959 Sat Dec  8 20:16:45 CET 2007
+	- grr, really update for EV-1.72.
+
+0.9958 Sat Dec  8 19:37:33 CET 2007
 	- fix a longstanding bug where a jingle would be played
           repeatedly if no server-provided music was available.
+        - update for EV-1.72 API.
 
 0.9957 Wed Dec  5 20:06:05 CET 2007
 	- switch to new JSON::XS 2.01 API.