# HG changeset patch
# User sheepluva
# Date 1446909327 -3600
# Node ID 62287d4044e72d99b8a999a14b5acfc7f6a2b46a
# Parent  516e9b1ac88916103772dfaac3783a3de8cda18e# Parent  8bf3ad5a6f131c2b35ee6af9dbe85a7b933178a0
merge orphan head (while discarding all its changes) to make koda and his hg-git happy

diff -r 516e9b1ac889 -r 62287d4044e7 hedgewars/hwengine.pas
diff -r 516e9b1ac889 -r 62287d4044e7 hedgewars/options.inc
diff -r 516e9b1ac889 -r 62287d4044e7 hedgewars/uChat.pas
diff -r 516e9b1ac889 -r 62287d4044e7 hedgewars/uGearsRender.pas
diff -r 516e9b1ac889 -r 62287d4044e7 hedgewars/uLandTexture.pas
diff -r 516e9b1ac889 -r 62287d4044e7 hedgewars/uMatrix.pas
diff -r 516e9b1ac889 -r 62287d4044e7 hedgewars/uRender.pas
diff -r 516e9b1ac889 -r 62287d4044e7 hedgewars/uRenderUtils.pas
diff -r 516e9b1ac889 -r 62287d4044e7 hedgewars/uScript.pas
diff -r 516e9b1ac889 -r 62287d4044e7 hedgewars/uStore.pas
diff -r 516e9b1ac889 -r 62287d4044e7 hedgewars/uTextures.pas
diff -r 516e9b1ac889 -r 62287d4044e7 hedgewars/uTypes.pas
diff -r 516e9b1ac889 -r 62287d4044e7 hedgewars/uVariables.pas
diff -r 516e9b1ac889 -r 62287d4044e7 hedgewars/uWorld.pas
diff -r 516e9b1ac889 -r 62287d4044e7 share/hedgewars/Data/CMakeLists.txt
diff -r 516e9b1ac889 -r 62287d4044e7 share/hedgewars/Data/Shaders/CMakeLists.txt
diff -r 516e9b1ac889 -r 62287d4044e7 share/hedgewars/Data/Shaders/default.fs
diff -r 516e9b1ac889 -r 62287d4044e7 share/hedgewars/Data/Shaders/default.vs
diff -r 516e9b1ac889 -r 62287d4044e7 share/hedgewars/Data/Shaders/water.fs
diff -r 516e9b1ac889 -r 62287d4044e7 share/hedgewars/Data/Shaders/water.vs