# HG changeset patch
# User unc0rr
# Date 1354992803 -14400
# Node ID 9cdfcb5b7ddd9b60d35b777d4fbafa21c774b7ba
# Parent  d4e113e745a9dfad102496f8e75eb728f3023c12# Parent  7324298dbcc1e89e9b849c54f6b5051197c791ac
Merge with default

diff -r d4e113e745a9 -r 9cdfcb5b7ddd CMakeLists.txt
diff -r d4e113e745a9 -r 9cdfcb5b7ddd QTfrontend/CMakeLists.txt
diff -r d4e113e745a9 -r 9cdfcb5b7ddd QTfrontend/main.cpp
diff -r d4e113e745a9 -r 9cdfcb5b7ddd hedgewars/ArgParsers.inc
diff -r d4e113e745a9 -r 9cdfcb5b7ddd hedgewars/hwengine.pas
diff -r d4e113e745a9 -r 9cdfcb5b7ddd project_files/frontlib/frontlib.h
diff -r d4e113e745a9 -r 9cdfcb5b7ddd project_files/frontlib/hwconsts.h
diff -r d4e113e745a9 -r 9cdfcb5b7ddd project_files/hedgewars.pro