# HG changeset patch
# User koda
# Date 1362089651 -3600
# Node ID f7c194533d45fd9b06027f736005f51d71bd01d8
# Parent  90f445317e8ad420a16c2d9b383445a3857a95bb# Parent  8946f98d09a0b7b0a34f398fef2357f911d4a669
mysterious merge

diff -r 90f445317e8a -r f7c194533d45 hedgewars/GSHandlers.inc
diff -r 90f445317e8a -r f7c194533d45 hedgewars/uLandGraphics.pas