# HG changeset patch
# User koda
# Date 1354582362 -3600
# Node ID 81553c5b9fd0347c0cdb04ac67ef28519a4b4c8a
# Parent  555a6e06cb3309f8a84fbdd5b1e766780257504c# Parent  f837447298c3c7e473c83bfdc10d4f3ce3a10629
third merge, yay

diff -r 555a6e06cb33 -r 81553c5b9fd0 hedgewars/ArgParsers.inc
diff -r 555a6e06cb33 -r 81553c5b9fd0 hedgewars/hwengine.pas