# HG changeset patch
# User sheepluva
# Date 1446590012 -3600
# Node ID a3f3fc9af429f653958c354ffbaefc5611cc85dd
# Parent  f35b207087a64cd4ec3d5898d3cc58d118687b8c# Parent  48a3145cd11818625cc6316de26dccafc17eaec7
merge changelog changes of 0.9.22 into default

diff -r f35b207087a6 -r a3f3fc9af429 ChangeLog.txt
--- a/ChangeLog.txt	Tue Nov 03 21:24:35 2015 +0100
+++ b/ChangeLog.txt	Tue Nov 03 23:33:32 2015 +0100
@@ -7,10 +7,11 @@
 0.9.21 -> 0.9.22
  + New Weapon / Map object: AirMine (floating mine that will follow nearby hedgehogs)
  + Extensive changes to TechRacer: Variable terrain types, enhanced parameters, hwmap interpreter, fuel limiter, etc. 
+ + HedgeEditor - create missions/etc. in-game! see http://hedgewars.org/HedgeEditor
  + Map previews can now take script parameters into account and preview waypoints in TechRacer
  + Added a couple new flags
  + Various tweaks to the interface and in-game chat
- + Divided teams options will now just be ignored when more/less than 2 teams, instead of displaying a fatal error
+ + Divided teams options will now just be ignored when more/less than 2 teams/clans, instead of displaying a fatal error
  + Added 6 TechRacer maps to TechMaps
  + Added 3 SpeedShoppa Challenges: Shoppa Love, Ropes and Crates, The Customer is King
  + Hammer damage is now rounded up. This means it can be used to execute hedgehogs with only 1 hp.