# HG changeset patch
# User nemo
# Date 1289606256 18000
# Node ID 1f5604cd99bedfe1a47b76a25f59c49cc1a5a9b8
# Parent  d79ffcdd77dfb132eb31353d66452d62b0b87976# Parent  0313d5577fced1bf7e965da49599f6cf4352bcc4
This revision should, in theory, correctly merge 0.9.14 and tip, so that future merges of 0.9.14 should work properly

diff -r d79ffcdd77df -r 1f5604cd99be QTfrontend/pages.cpp
diff -r d79ffcdd77df -r 1f5604cd99be gameServer/Actions.hs
diff -r d79ffcdd77df -r 1f5604cd99be gameServer/CMakeLists.txt
diff -r d79ffcdd77df -r 1f5604cd99be gameServer/ClientIO.hs
diff -r d79ffcdd77df -r 1f5604cd99be gameServer/CoreTypes.hs
diff -r d79ffcdd77df -r 1f5604cd99be gameServer/HWProtoCore.hs
diff -r d79ffcdd77df -r 1f5604cd99be gameServer/HWProtoInRoomState.hs
diff -r d79ffcdd77df -r 1f5604cd99be gameServer/HWProtoLobbyState.hs
diff -r d79ffcdd77df -r 1f5604cd99be gameServer/HWProtoNEState.hs
diff -r d79ffcdd77df -r 1f5604cd99be gameServer/NetRoutines.hs
diff -r d79ffcdd77df -r 1f5604cd99be gameServer/OfficialServer/DBInteraction.hs
diff -r d79ffcdd77df -r 1f5604cd99be gameServer/OfficialServer/extdbinterface.hs
diff -r d79ffcdd77df -r 1f5604cd99be gameServer/Opts.hs
diff -r d79ffcdd77df -r 1f5604cd99be gameServer/ServerCore.hs
diff -r d79ffcdd77df -r 1f5604cd99be gameServer/Utils.hs
diff -r d79ffcdd77df -r 1f5604cd99be gameServer/hedgewars-server.hs
diff -r d79ffcdd77df -r 1f5604cd99be gameServer/stresstest.hs
diff -r d79ffcdd77df -r 1f5604cd99be gameServer/stresstest2.hs
diff -r d79ffcdd77df -r 1f5604cd99be hedgewars/GSHandlers.inc
diff -r d79ffcdd77df -r 1f5604cd99be hedgewars/uGears.pas