Index: trunk/docs/Changelog
===================================================================
--- trunk/docs/Changelog	(revision 256)
+++ trunk/docs/Changelog	(revision 257)
@@ -1,3 +1,5 @@
 2.6.0:
+	* fix bug with parallel compilation of cutest in Makefile 
+	* sh_mem.c: fix deadlock in debug-only code
 	* Evaluate glob patterns for each run of file check
 	* Add compile option to disable compiling with SSP