# HG changeset patch
# User Xeli
# Date 1321115267 -3600
# Node ID b05d3af9a58ef019bf3017fc5f6135010055dd0a
# Parent  5d9cc2441c48125ad788493fc634eeead2525bed# Parent  9eb6c4a8d633a76027fb2563cf4bd2270f94c828
merge

diff -r 5d9cc2441c48 -r b05d3af9a58e hedgewars/SDLh.pas
diff -r 5d9cc2441c48 -r b05d3af9a58e hedgewars/hwengine.pas