sheepy-clone: changeset 4295:1f5604cd99be

This revision should, in theory, correctly merge 0.9.14 and tip, so that future merges of 0.9.14 should work properly

QTfrontend/pages.cpp		file \| annotate \| diff \| comparison \| revisions
gameServer/Actions.hs		file \| annotate \| diff \| comparison \| revisions
gameServer/CMakeLists.txt		file \| annotate \| diff \| comparison \| revisions
gameServer/ClientIO.hs		file \| annotate \| diff \| comparison \| revisions
gameServer/CoreTypes.hs		file \| annotate \| diff \| comparison \| revisions
gameServer/HWProtoCore.hs		file \| annotate \| diff \| comparison \| revisions
gameServer/HWProtoInRoomState.hs		file \| annotate \| diff \| comparison \| revisions
gameServer/HWProtoLobbyState.hs		file \| annotate \| diff \| comparison \| revisions
gameServer/HWProtoNEState.hs		file \| annotate \| diff \| comparison \| revisions
gameServer/NetRoutines.hs		file \| annotate \| diff \| comparison \| revisions
gameServer/OfficialServer/DBInteraction.hs		file \| annotate \| diff \| comparison \| revisions
gameServer/OfficialServer/extdbinterface.hs		file \| annotate \| diff \| comparison \| revisions
gameServer/Opts.hs		file \| annotate \| diff \| comparison \| revisions
gameServer/ServerCore.hs		file \| annotate \| diff \| comparison \| revisions
gameServer/Utils.hs		file \| annotate \| diff \| comparison \| revisions
gameServer/hedgewars-server.hs		file \| annotate \| diff \| comparison \| revisions
gameServer/stresstest.hs		file \| annotate \| diff \| comparison \| revisions
gameServer/stresstest2.hs		file \| annotate \| diff \| comparison \| revisions
hedgewars/GSHandlers.inc		file \| annotate \| diff \| comparison \| revisions
hedgewars/uGears.pas		file \| annotate \| diff \| comparison \| revisions

sheepy-clone