From git://github.com/teeworlds/teeworlds
 * branch            master     -> FETCH_HEAD
CONFLICT (rename/delete): Rename data/audio/wp_rifle_bnce-01.wv->data/audio/wp_laser_bnce-01.wv in 8372849cbafb02a58fcf8aa7c706cad5c5f16731 and deleted in HEAD
CONFLICT (rename/delete): Rename data/audio/wp_rifle_bnce-02.wv->data/audio/wp_laser_bnce-02.wv in 8372849cbafb02a58fcf8aa7c706cad5c5f16731 and deleted in HEAD
CONFLICT (rename/delete): Rename data/audio/wp_rifle_bnce-03.wv->data/audio/wp_laser_bnce-03.wv in 8372849cbafb02a58fcf8aa7c706cad5c5f16731 and deleted in HEAD
CONFLICT (rename/delete): Rename data/audio/wp_rifle_fire-01.wv->data/audio/wp_laser_fire-01.wv in 8372849cbafb02a58fcf8aa7c706cad5c5f16731 and deleted in HEAD
CONFLICT (rename/delete): Rename data/audio/wp_rifle_fire-02.wv->data/audio/wp_laser_fire-02.wv in 8372849cbafb02a58fcf8aa7c706cad5c5f16731 and deleted in HEAD
CONFLICT (rename/delete): Rename data/audio/wp_rifle_fire-03.wv->data/audio/wp_laser_fire-03.wv in 8372849cbafb02a58fcf8aa7c706cad5c5f16731 and deleted in HEAD
CONFLICT (delete/modify): .gitignore deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of .gitignore left in tree.
Auto-merging bam.lua
CONFLICT (content): Merge conflict in bam.lua
CONFLICT (delete/modify): data/audio/sfx_msg-client.wv deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/audio/sfx_msg-client.wv left in tree.
CONFLICT (delete/modify): data/audio/sfx_msg-highlight.wv deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/audio/sfx_msg-highlight.wv left in tree.
CONFLICT (delete/modify): data/countryflags/AR.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/AR.png left in tree.
CONFLICT (delete/modify): data/countryflags/AT.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/AT.png left in tree.
CONFLICT (delete/modify): data/countryflags/AU.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/AU.png left in tree.
CONFLICT (delete/modify): data/countryflags/BA.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/BA.png left in tree.
CONFLICT (delete/modify): data/countryflags/BE.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/BE.png left in tree.
CONFLICT (delete/modify): data/countryflags/BG.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/BG.png left in tree.
CONFLICT (delete/modify): data/countryflags/BR.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/BR.png left in tree.
CONFLICT (delete/modify): data/countryflags/BY.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/BY.png left in tree.
CONFLICT (delete/modify): data/countryflags/CA.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/CA.png left in tree.
CONFLICT (delete/modify): data/countryflags/CH.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/CH.png left in tree.
CONFLICT (delete/modify): data/countryflags/CL.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/CL.png left in tree.
CONFLICT (delete/modify): data/countryflags/CN.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/CN.png left in tree.
CONFLICT (delete/modify): data/countryflags/CO.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/CO.png left in tree.
CONFLICT (delete/modify): data/countryflags/CZ.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/CZ.png left in tree.
CONFLICT (delete/modify): data/countryflags/DE.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/DE.png left in tree.
CONFLICT (delete/modify): data/countryflags/DK.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/DK.png left in tree.
CONFLICT (delete/modify): data/countryflags/EE.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/EE.png left in tree.
CONFLICT (delete/modify): data/countryflags/EG.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/EG.png left in tree.
CONFLICT (delete/modify): data/countryflags/ES.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/ES.png left in tree.
CONFLICT (delete/modify): data/countryflags/FI.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/FI.png left in tree.
CONFLICT (delete/modify): data/countryflags/FR.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/FR.png left in tree.
CONFLICT (delete/modify): data/countryflags/GB.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/GB.png left in tree.
CONFLICT (delete/modify): data/countryflags/GR.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/GR.png left in tree.
CONFLICT (delete/modify): data/countryflags/HR.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/HR.png left in tree.
CONFLICT (delete/modify): data/countryflags/HU.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/HU.png left in tree.
CONFLICT (delete/modify): data/countryflags/ID.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/ID.png left in tree.
CONFLICT (delete/modify): data/countryflags/IL.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/IL.png left in tree.
CONFLICT (delete/modify): data/countryflags/IN.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/IN.png left in tree.
CONFLICT (delete/modify): data/countryflags/IR.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/IR.png left in tree.
CONFLICT (delete/modify): data/countryflags/IT.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/IT.png left in tree.
CONFLICT (delete/modify): data/countryflags/KZ.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/KZ.png left in tree.
CONFLICT (delete/modify): data/countryflags/LT.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/LT.png left in tree.
CONFLICT (delete/modify): data/countryflags/LU.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/LU.png left in tree.
CONFLICT (delete/modify): data/countryflags/LV.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/LV.png left in tree.
CONFLICT (delete/modify): data/countryflags/MX.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/MX.png left in tree.
CONFLICT (delete/modify): data/countryflags/NL.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/NL.png left in tree.
CONFLICT (delete/modify): data/countryflags/NO.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/NO.png left in tree.
CONFLICT (delete/modify): data/countryflags/PH.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/PH.png left in tree.
CONFLICT (delete/modify): data/countryflags/PK.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/PK.png left in tree.
CONFLICT (delete/modify): data/countryflags/PL.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/PL.png left in tree.
CONFLICT (delete/modify): data/countryflags/PT.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/PT.png left in tree.
CONFLICT (delete/modify): data/countryflags/RO.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/RO.png left in tree.
CONFLICT (delete/modify): data/countryflags/RS.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/RS.png left in tree.
CONFLICT (delete/modify): data/countryflags/RU.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/RU.png left in tree.
CONFLICT (delete/modify): data/countryflags/SA.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/SA.png left in tree.
CONFLICT (delete/modify): data/countryflags/SE.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/SE.png left in tree.
CONFLICT (delete/modify): data/countryflags/SK.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/SK.png left in tree.
CONFLICT (delete/modify): data/countryflags/SV.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/SV.png left in tree.
CONFLICT (delete/modify): data/countryflags/TR.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/TR.png left in tree.
CONFLICT (delete/modify): data/countryflags/UA.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/UA.png left in tree.
CONFLICT (delete/modify): data/countryflags/US.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/US.png left in tree.
CONFLICT (delete/modify): data/countryflags/XEN.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/XEN.png left in tree.
CONFLICT (delete/modify): data/countryflags/XNI.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/XNI.png left in tree.
CONFLICT (delete/modify): data/countryflags/XSC.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/XSC.png left in tree.
CONFLICT (delete/modify): data/countryflags/XWA.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/XWA.png left in tree.
CONFLICT (delete/modify): data/countryflags/ZA.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/ZA.png left in tree.
CONFLICT (delete/modify): data/countryflags/index.txt deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/index.txt left in tree.
CONFLICT (delete/modify): data/fonts/DejaVuSans.ttf deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/fonts/DejaVuSans.ttf left in tree.
Auto-merging datasrc/content.py
CONFLICT (content): Merge conflict in datasrc/content.py
Auto-merging datasrc/network.py
CONFLICT (content): Merge conflict in datasrc/network.py
CONFLICT (delete/modify): license.txt deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of license.txt left in tree.
Auto-merging other/freetype/VERSION
Auto-merging other/freetype/freetype.lua
Auto-merging other/freetype/include/freetype/config/ftconfig.h
Auto-merging other/freetype/include/freetype/config/ftheader.h
Auto-merging other/freetype/include/freetype/config/ftmodule.h
Auto-merging other/freetype/include/freetype/config/ftoption.h
Auto-merging other/freetype/include/freetype/config/ftstdlib.h
Auto-merging other/freetype/include/freetype/freetype.h
Auto-merging other/freetype/include/freetype/ftadvanc.h
Auto-merging other/freetype/include/freetype/ftbbox.h
Auto-merging other/freetype/include/freetype/ftbdf.h
Auto-merging other/freetype/include/freetype/ftbitmap.h
Auto-merging other/freetype/include/freetype/ftcache.h
Auto-merging other/freetype/include/freetype/ftchapters.h
Auto-merging other/freetype/include/freetype/ftcid.h
Auto-merging other/freetype/include/freetype/fterrdef.h
Auto-merging other/freetype/include/freetype/fterrors.h
Auto-merging other/freetype/include/freetype/ftgasp.h
Auto-merging other/freetype/include/freetype/ftglyph.h
Auto-merging other/freetype/include/freetype/ftgxval.h
Auto-merging other/freetype/include/freetype/ftgzip.h
Auto-merging other/freetype/include/freetype/ftimage.h
Auto-merging other/freetype/include/freetype/ftincrem.h
Auto-merging other/freetype/include/freetype/ftlcdfil.h
Auto-merging other/freetype/include/freetype/ftlist.h
Auto-merging other/freetype/include/freetype/ftlzw.h
Auto-merging other/freetype/include/freetype/ftmac.h
Auto-merging other/freetype/include/freetype/ftmm.h
Auto-merging other/freetype/include/freetype/ftmodapi.h
Auto-merging other/freetype/include/freetype/ftmoderr.h
Auto-merging other/freetype/include/freetype/ftotval.h
Auto-merging other/freetype/include/freetype/ftoutln.h
Auto-merging other/freetype/include/freetype/ftpfr.h
Auto-merging other/freetype/include/freetype/ftrender.h
Auto-merging other/freetype/include/freetype/ftsizes.h
Auto-merging other/freetype/include/freetype/ftsnames.h
Auto-merging other/freetype/include/freetype/ftstroke.h
Auto-merging other/freetype/include/freetype/ftsynth.h
Auto-merging other/freetype/include/freetype/ftsystem.h
Auto-merging other/freetype/include/freetype/fttrigon.h
Auto-merging other/freetype/include/freetype/fttypes.h
Auto-merging other/freetype/include/freetype/ftwinfnt.h
Auto-merging other/freetype/include/freetype/ftxf86.h
Auto-merging other/freetype/include/freetype/internal/autohint.h
Auto-merging other/freetype/include/freetype/internal/ftcalc.h
Auto-merging other/freetype/include/freetype/internal/ftdebug.h
Auto-merging other/freetype/include/freetype/internal/ftdriver.h
Auto-merging other/freetype/include/freetype/internal/ftgloadr.h
Auto-merging other/freetype/include/freetype/internal/ftmemory.h
Auto-merging other/freetype/include/freetype/internal/ftobjs.h
Auto-merging other/freetype/include/freetype/internal/ftpic.h
Auto-merging other/freetype/include/freetype/internal/ftrfork.h
Auto-merging other/freetype/include/freetype/internal/ftserv.h
Auto-merging other/freetype/include/freetype/internal/ftstream.h
Auto-merging other/freetype/include/freetype/internal/fttrace.h
Auto-merging other/freetype/include/freetype/internal/ftvalid.h
Auto-merging other/freetype/include/freetype/internal/internal.h
Removing other/freetype/include/freetype/internal/pcftypes.h
Auto-merging other/freetype/include/freetype/internal/psaux.h
Auto-merging other/freetype/include/freetype/internal/pshints.h
Auto-merging other/freetype/include/freetype/internal/services/svbdf.h
Auto-merging other/freetype/include/freetype/internal/services/svcid.h
Auto-merging other/freetype/include/freetype/internal/services/svgldict.h
Auto-merging other/freetype/include/freetype/internal/services/svgxval.h
Auto-merging other/freetype/include/freetype/internal/services/svkern.h
Auto-merging other/freetype/include/freetype/internal/services/svmm.h
Auto-merging other/freetype/include/freetype/internal/services/svotval.h
Auto-merging other/freetype/include/freetype/internal/services/svpfr.h
Auto-merging other/freetype/include/freetype/internal/services/svpostnm.h
Auto-merging other/freetype/include/freetype/internal/services/svpscmap.h
Auto-merging other/freetype/include/freetype/internal/services/svpsinfo.h
Auto-merging other/freetype/include/freetype/internal/services/svsfnt.h
Auto-merging other/freetype/include/freetype/internal/services/svttcmap.h
Auto-merging other/freetype/include/freetype/internal/services/svtteng.h
Auto-merging other/freetype/include/freetype/internal/services/svttglyf.h
Auto-merging other/freetype/include/freetype/internal/services/svwinfnt.h
Auto-merging other/freetype/include/freetype/internal/services/svxf86nm.h
Auto-merging other/freetype/include/freetype/internal/sfnt.h
Auto-merging other/freetype/include/freetype/internal/t1types.h
Auto-merging other/freetype/include/freetype/internal/tttypes.h
Auto-merging other/freetype/include/freetype/t1tables.h
Auto-merging other/freetype/include/freetype/ttnameid.h
Auto-merging other/freetype/include/freetype/tttables.h
Auto-merging other/freetype/include/freetype/tttags.h
Auto-merging other/freetype/include/freetype/ttunpat.h
Auto-merging other/freetype/include/ft2build.h
Removing other/freetype/lib/freetype.dll
Removing other/freetype/lib/freetype.lib
Auto-merging other/sdl/sdl.lua
CONFLICT (delete/modify): other/sdl/vc2005libs/SDL.dll deleted in 8372849cbafb02a58fcf8aa7c706cad5c5f16731 and modified in HEAD. Version HEAD of other/sdl/vc2005libs/SDL.dll left in tree.
CONFLICT (delete/modify): other/sdl/vc2005libs/SDL.lib deleted in 8372849cbafb02a58fcf8aa7c706cad5c5f16731 and modified in HEAD. Version HEAD of other/sdl/vc2005libs/SDL.lib left in tree.
CONFLICT (delete/modify): other/sdl/vc2005libs/SDLmain.lib deleted in 8372849cbafb02a58fcf8aa7c706cad5c5f16731 and modified in HEAD. Version HEAD of other/sdl/vc2005libs/SDLmain.lib left in tree.
CONFLICT (delete/modify): readme.txt deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of readme.txt left in tree.
Auto-merging scripts/build.py
Auto-merging scripts/cmd5.py
CONFLICT (content): Merge conflict in scripts/cmd5.py
Auto-merging scripts/make_release.py
Removing scripts/update_localization.py
Auto-merging src/base/detect.h
CONFLICT (content): Merge conflict in src/base/detect.h
Auto-merging src/base/system.c
CONFLICT (content): Merge conflict in src/base/system.c
Auto-merging src/base/system.h
Auto-merging src/base/vmath.h
Auto-merging src/engine/client.h
Auto-merging src/engine/client/client.cpp
CONFLICT (content): Merge conflict in src/engine/client/client.cpp
Auto-merging src/engine/client/client.h
Auto-merging src/engine/client/friends.cpp
Auto-merging src/engine/client/graphics.cpp
CONFLICT (content): Merge conflict in src/engine/client/graphics.cpp
Auto-merging src/engine/client/graphics.h
Auto-merging src/engine/client/input.cpp
Auto-merging src/engine/client/serverbrowser.cpp
CONFLICT (content): Merge conflict in src/engine/client/serverbrowser.cpp
Auto-merging src/engine/client/sound.cpp
CONFLICT (content): Merge conflict in src/engine/client/sound.cpp
Auto-merging src/engine/client/text.cpp
Auto-merging src/engine/console.h
Auto-merging src/engine/demo.h
Auto-merging src/engine/docs/client_time.txt
Auto-merging src/engine/docs/prediction.txt
Auto-merging src/engine/docs/server_op.txt
Auto-merging src/engine/docs/snapshots.txt
Auto-merging src/engine/external/zlib/VERSION
Auto-merging src/engine/external/zlib/adler32.c
Auto-merging src/engine/external/zlib/compress.c
Auto-merging src/engine/external/zlib/crc32.c
Auto-merging src/engine/external/zlib/deflate.c
Auto-merging src/engine/external/zlib/deflate.h
Removing src/engine/external/zlib/gzio.c
Auto-merging src/engine/external/zlib/infback.c
Auto-merging src/engine/external/zlib/inffast.c
Auto-merging src/engine/external/zlib/inffast.h
Auto-merging src/engine/external/zlib/inflate.c
Auto-merging src/engine/external/zlib/inflate.h
Auto-merging src/engine/external/zlib/inftrees.c
Auto-merging src/engine/external/zlib/inftrees.h
Auto-merging src/engine/external/zlib/trees.c
Auto-merging src/engine/external/zlib/trees.h
Auto-merging src/engine/external/zlib/uncompr.c
Auto-merging src/engine/external/zlib/zconf.h
Removing src/engine/external/zlib/zconf.in.h
Auto-merging src/engine/external/zlib/zlib.h
Auto-merging src/engine/external/zlib/zutil.c
Auto-merging src/engine/external/zlib/zutil.h
Auto-merging src/engine/graphics.h
CONFLICT (content): Merge conflict in src/engine/graphics.h
Auto-merging src/engine/input.h
Auto-merging src/engine/masterserver.h
Auto-merging src/engine/server.h
CONFLICT (content): Merge conflict in src/engine/server.h
Auto-merging src/engine/server/register.cpp
Auto-merging src/engine/server/server.cpp
CONFLICT (content): Merge conflict in src/engine/server/server.cpp
Auto-merging src/engine/server/server.h
CONFLICT (content): Merge conflict in src/engine/server/server.h
Auto-merging src/engine/serverbrowser.h
Auto-merging src/engine/shared/config.cpp
Auto-merging src/engine/shared/config.h
Auto-merging src/engine/shared/config_variables.h
CONFLICT (content): Merge conflict in src/engine/shared/config_variables.h
Auto-merging src/engine/shared/console.cpp
CONFLICT (content): Merge conflict in src/engine/shared/console.cpp
Auto-merging src/engine/shared/console.h
CONFLICT (content): Merge conflict in src/engine/shared/console.h
Auto-merging src/engine/shared/datafile.cpp
Auto-merging src/engine/shared/datafile.h
Auto-merging src/engine/shared/demo.cpp
Auto-merging src/engine/shared/demo.h
Auto-merging src/engine/shared/econ.cpp
CONFLICT (add/add): Merge conflict in src/engine/shared/econ.cpp
Auto-merging src/engine/shared/econ.h
CONFLICT (add/add): Merge conflict in src/engine/shared/econ.h
Auto-merging src/engine/shared/filecollection.cpp
CONFLICT (add/add): Merge conflict in src/engine/shared/filecollection.cpp
Auto-merging src/engine/shared/filecollection.h
CONFLICT (add/add): Merge conflict in src/engine/shared/filecollection.h
Auto-merging src/engine/shared/masterserver.cpp
CONFLICT (content): Merge conflict in src/engine/shared/masterserver.cpp
Auto-merging src/engine/shared/memheap.cpp
Auto-merging src/engine/shared/memheap.h
Auto-merging src/engine/shared/network.cpp
Auto-merging src/engine/shared/network.h
CONFLICT (content): Merge conflict in src/engine/shared/network.h
Auto-merging src/engine/shared/network_client.cpp
Auto-merging src/engine/shared/network_conn.cpp
Auto-merging src/engine/shared/network_console.cpp
CONFLICT (add/add): Merge conflict in src/engine/shared/network_console.cpp
Auto-merging src/engine/shared/network_console_conn.cpp
CONFLICT (add/add): Merge conflict in src/engine/shared/network_console_conn.cpp
Auto-merging src/engine/shared/network_server.cpp
CONFLICT (content): Merge conflict in src/engine/shared/network_server.cpp
Auto-merging src/engine/shared/protocol.h
CONFLICT (content): Merge conflict in src/engine/shared/protocol.h
Auto-merging src/engine/shared/storage.cpp
CONFLICT (content): Merge conflict in src/engine/shared/storage.cpp
Auto-merging src/engine/sound.h
Auto-merging src/engine/storage.h
Auto-merging src/game/client/components/binds.cpp
Auto-merging src/game/client/components/chat.cpp
Auto-merging src/game/client/components/chat.h
Auto-merging src/game/client/components/console.cpp
CONFLICT (content): Merge conflict in src/game/client/components/console.cpp
Auto-merging src/game/client/components/console.h
Auto-merging src/game/client/components/controls.cpp
Auto-merging src/game/client/components/countryflags.cpp
CONFLICT (content): Merge conflict in src/game/client/components/countryflags.cpp
Auto-merging src/game/client/components/countryflags.h
Auto-merging src/game/client/components/damageind.cpp
Auto-merging src/game/client/components/damageind.h
Auto-merging src/game/client/components/effects.cpp
Auto-merging src/game/client/components/emoticon.cpp
CONFLICT (content): Merge conflict in src/game/client/components/emoticon.cpp
Auto-merging src/game/client/components/hud.cpp
CONFLICT (content): Merge conflict in src/game/client/components/hud.cpp
Auto-merging src/game/client/components/hud.h
Auto-merging src/game/client/components/items.cpp
CONFLICT (content): Merge conflict in src/game/client/components/items.cpp
Auto-merging src/game/client/components/items.h
Auto-merging src/game/client/components/maplayers.cpp
Auto-merging src/game/client/components/maplayers.h
Auto-merging src/game/client/components/menus.cpp
CONFLICT (content): Merge conflict in src/game/client/components/menus.cpp
Auto-merging src/game/client/components/menus.h
Auto-merging src/game/client/components/menus_browser.cpp
CONFLICT (content): Merge conflict in src/game/client/components/menus_browser.cpp
Auto-merging src/game/client/components/menus_demo.cpp
Auto-merging src/game/client/components/menus_ingame.cpp
CONFLICT (content): Merge conflict in src/game/client/components/menus_ingame.cpp
Auto-merging src/game/client/components/menus_settings.cpp
CONFLICT (content): Merge conflict in src/game/client/components/menus_settings.cpp
Auto-merging src/game/client/components/particles.cpp
Auto-merging src/game/client/components/players.cpp
CONFLICT (content): Merge conflict in src/game/client/components/players.cpp
Auto-merging src/game/client/components/players.h
Auto-merging src/game/client/components/scoreboard.cpp
Auto-merging src/game/client/components/skins.cpp
Auto-merging src/game/client/components/skins.h
Auto-merging src/game/client/components/sounds.cpp
Auto-merging src/game/client/components/sounds.h
Auto-merging src/game/client/components/spectator.cpp
Auto-merging src/game/client/components/voting.cpp
Auto-merging src/game/client/gameclient.cpp
CONFLICT (content): Merge conflict in src/game/client/gameclient.cpp
Auto-merging src/game/client/gameclient.h
Auto-merging src/game/client/lineinput.cpp
Auto-merging src/game/client/render.cpp
Auto-merging src/game/client/render.h
Auto-merging src/game/client/render_map.cpp
Auto-merging src/game/client/ui.cpp
Auto-merging src/game/client/ui.h
Auto-merging src/game/editor/auto_map.cpp
CONFLICT (add/add): Merge conflict in src/game/editor/auto_map.cpp
Auto-merging src/game/editor/auto_map.h
CONFLICT (add/add): Merge conflict in src/game/editor/auto_map.h
Auto-merging src/game/editor/editor.cpp
CONFLICT (content): Merge conflict in src/game/editor/editor.cpp
Auto-merging src/game/editor/editor.h
Auto-merging src/game/editor/io.cpp
Auto-merging src/game/editor/layer_game.cpp
Auto-merging src/game/editor/layer_quads.cpp
Auto-merging src/game/editor/layer_tiles.cpp
Auto-merging src/game/editor/popups.cpp
CONFLICT (content): Merge conflict in src/game/editor/popups.cpp
Auto-merging src/game/gamecore.cpp
Auto-merging src/game/layers.cpp
Auto-merging src/game/mapitems.h
CONFLICT (content): Merge conflict in src/game/mapitems.h
Auto-merging src/game/server/entities/character.cpp
CONFLICT (content): Merge conflict in src/game/server/entities/character.cpp
Auto-merging src/game/server/entities/character.h
Auto-merging src/game/server/entities/flag.cpp
Auto-merging src/game/server/entities/flag.h
Auto-merging src/game/server/entities/laser.cpp
CONFLICT (content): Merge conflict in src/game/server/entities/laser.cpp
Auto-merging src/game/server/entities/laser.h
Auto-merging src/game/server/entities/pickup.cpp
CONFLICT (content): Merge conflict in src/game/server/entities/pickup.cpp
Auto-merging src/game/server/entities/pickup.h
Auto-merging src/game/server/entities/projectile.cpp
Auto-merging src/game/server/entities/projectile.h
Auto-merging src/game/server/entity.cpp
Auto-merging src/game/server/entity.h
Auto-merging src/game/server/eventhandler.cpp
Auto-merging src/game/server/gamecontext.cpp
CONFLICT (content): Merge conflict in src/game/server/gamecontext.cpp
Auto-merging src/game/server/gamecontext.h
Auto-merging src/game/server/gamecontroller.cpp
CONFLICT (content): Merge conflict in src/game/server/gamecontroller.cpp
Auto-merging src/game/server/gamecontroller.h
CONFLICT (content): Merge conflict in src/game/server/gamecontroller.h
Auto-merging src/game/server/gamemodes/ctf.cpp
CONFLICT (content): Merge conflict in src/game/server/gamemodes/ctf.cpp
Auto-merging src/game/server/gamemodes/ctf.h
CONFLICT (content): Merge conflict in src/game/server/gamemodes/ctf.h
Auto-merging src/game/server/gamemodes/dm.cpp
Auto-merging src/game/server/gamemodes/dm.h
Auto-merging src/game/server/gamemodes/tdm.cpp
Auto-merging src/game/server/gamemodes/tdm.h
Auto-merging src/game/server/gameworld.cpp
Auto-merging src/game/server/player.cpp
CONFLICT (content): Merge conflict in src/game/server/player.cpp
Auto-merging src/game/server/player.h
Auto-merging src/game/variables.h
Auto-merging src/game/version.h
CONFLICT (content): Merge conflict in src/game/version.h
Auto-merging src/mastersrv/mastersrv.cpp
Auto-merging src/tools/crapnet.cpp
Auto-merging src/tools/dilate.cpp
Auto-merging src/tools/fake_server.cpp
Auto-merging src/tools/map_resave.cpp
Auto-merging src/tools/map_version.cpp
Auto-merging src/tools/tileset_borderfix.cpp
Auto-merging src/versionsrv/versionsrv.cpp
Auto-merging src/versionsrv/versionsrv.h
Automatic merge failed; fix conflicts and then commit the result.