# HG changeset patch
# User nemo
# Date 1361928409 18000
# Node ID 47084c6fcb4e16ef20d3a93ece6e97da5a826a25
# Parent  ea20d9cc8515621691b311d9ec6df471feabc13e# Parent  6319accfa04a2605af0b22718ea639cfdf7df3da
huh. how'd we end up needing a merge here...

diff -r ea20d9cc8515 -r 47084c6fcb4e hedgewars/GSHandlers.inc
diff -r ea20d9cc8515 -r 47084c6fcb4e hedgewars/uLandGraphics.pas