X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=ChangeLog;h=c4ffb8114a6743728548102aa89c6be35f631d36;hb=e3ef41011a3564492d12988716af8fc1f090ac6b;hp=5eb677f1cd1e6b116a8344584b7863e6c4307431;hpb=7fbc29937c69f42e609080ddd29595e01750ec4c;p=rocksndiamonds.git

diff --git a/ChangeLog b/ChangeLog
index 5eb677f1..c4ffb811 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,11 @@
 2010-01-10
-	* added new element "from_level_template" that is replaced by element
+	* added new element "from_level_template" which is replaced by element
 	  from level template at same playfield position when loaded (currently
 	  not accessible from level editor, but only used for special Sokoban
 	  level conversion when using "special_flags: load_xsb_to_ces")
+	* added special behaviour for "special_flags: load_xsb_to_ces": global
+	  settings of individual level files are overwritten by template level
+	  (except playfield size, level name, level author and template flag)
 
 2010-01-07
 	* added handling of gravity ports when converting Supaplex style R'n'D