Bugabuse.Net Pastebin

Untitled

From Anonymous, 3 Years ago, written in Plain Text, viewed 45 times.
URL https://paste.bugabuse.net/view/1230642 Embed
Download Paste or View Raw
  1. From git://github.com/teeworlds/teeworlds
  2.  * branch            master     -> FETCH_HEAD
  3. CONFLICT (rename/delete): Rename data/audio/wp_rifle_bnce-01.wv->data/audio/wp_laser_bnce-01.wv in 8372849cbafb02a58fcf8aa7c706cad5c5f16731 and deleted in HEAD
  4. CONFLICT (rename/delete): Rename data/audio/wp_rifle_bnce-02.wv->data/audio/wp_laser_bnce-02.wv in 8372849cbafb02a58fcf8aa7c706cad5c5f16731 and deleted in HEAD
  5. CONFLICT (rename/delete): Rename data/audio/wp_rifle_bnce-03.wv->data/audio/wp_laser_bnce-03.wv in 8372849cbafb02a58fcf8aa7c706cad5c5f16731 and deleted in HEAD
  6. CONFLICT (rename/delete): Rename data/audio/wp_rifle_fire-01.wv->data/audio/wp_laser_fire-01.wv in 8372849cbafb02a58fcf8aa7c706cad5c5f16731 and deleted in HEAD
  7. CONFLICT (rename/delete): Rename data/audio/wp_rifle_fire-02.wv->data/audio/wp_laser_fire-02.wv in 8372849cbafb02a58fcf8aa7c706cad5c5f16731 and deleted in HEAD
  8. CONFLICT (rename/delete): Rename data/audio/wp_rifle_fire-03.wv->data/audio/wp_laser_fire-03.wv in 8372849cbafb02a58fcf8aa7c706cad5c5f16731 and deleted in HEAD
  9. CONFLICT (delete/modify): .gitignore deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of .gitignore left in tree.
  10. Auto-merging bam.lua
  11. CONFLICT (content): Merge conflict in bam.lua
  12. 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.
  13. 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.
  14. CONFLICT (delete/modify): data/countryflags/AR.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/AR.png left in tree.
  15. CONFLICT (delete/modify): data/countryflags/AT.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/AT.png left in tree.
  16. CONFLICT (delete/modify): data/countryflags/AU.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/AU.png left in tree.
  17. CONFLICT (delete/modify): data/countryflags/BA.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/BA.png left in tree.
  18. CONFLICT (delete/modify): data/countryflags/BE.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/BE.png left in tree.
  19. CONFLICT (delete/modify): data/countryflags/BG.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/BG.png left in tree.
  20. CONFLICT (delete/modify): data/countryflags/BR.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/BR.png left in tree.
  21. CONFLICT (delete/modify): data/countryflags/BY.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/BY.png left in tree.
  22. CONFLICT (delete/modify): data/countryflags/CA.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/CA.png left in tree.
  23. CONFLICT (delete/modify): data/countryflags/CH.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/CH.png left in tree.
  24. CONFLICT (delete/modify): data/countryflags/CL.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/CL.png left in tree.
  25. CONFLICT (delete/modify): data/countryflags/CN.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/CN.png left in tree.
  26. CONFLICT (delete/modify): data/countryflags/CO.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/CO.png left in tree.
  27. CONFLICT (delete/modify): data/countryflags/CZ.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/CZ.png left in tree.
  28. CONFLICT (delete/modify): data/countryflags/DE.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/DE.png left in tree.
  29. CONFLICT (delete/modify): data/countryflags/DK.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/DK.png left in tree.
  30. CONFLICT (delete/modify): data/countryflags/EE.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/EE.png left in tree.
  31. CONFLICT (delete/modify): data/countryflags/EG.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/EG.png left in tree.
  32. CONFLICT (delete/modify): data/countryflags/ES.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/ES.png left in tree.
  33. CONFLICT (delete/modify): data/countryflags/FI.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/FI.png left in tree.
  34. CONFLICT (delete/modify): data/countryflags/FR.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/FR.png left in tree.
  35. CONFLICT (delete/modify): data/countryflags/GB.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/GB.png left in tree.
  36. CONFLICT (delete/modify): data/countryflags/GR.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/GR.png left in tree.
  37. CONFLICT (delete/modify): data/countryflags/HR.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/HR.png left in tree.
  38. CONFLICT (delete/modify): data/countryflags/HU.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/HU.png left in tree.
  39. CONFLICT (delete/modify): data/countryflags/ID.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/ID.png left in tree.
  40. CONFLICT (delete/modify): data/countryflags/IL.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/IL.png left in tree.
  41. CONFLICT (delete/modify): data/countryflags/IN.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/IN.png left in tree.
  42. CONFLICT (delete/modify): data/countryflags/IR.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/IR.png left in tree.
  43. CONFLICT (delete/modify): data/countryflags/IT.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/IT.png left in tree.
  44. CONFLICT (delete/modify): data/countryflags/KZ.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/KZ.png left in tree.
  45. CONFLICT (delete/modify): data/countryflags/LT.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/LT.png left in tree.
  46. CONFLICT (delete/modify): data/countryflags/LU.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/LU.png left in tree.
  47. CONFLICT (delete/modify): data/countryflags/LV.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/LV.png left in tree.
  48. CONFLICT (delete/modify): data/countryflags/MX.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/MX.png left in tree.
  49. CONFLICT (delete/modify): data/countryflags/NL.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/NL.png left in tree.
  50. CONFLICT (delete/modify): data/countryflags/NO.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/NO.png left in tree.
  51. CONFLICT (delete/modify): data/countryflags/PH.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/PH.png left in tree.
  52. CONFLICT (delete/modify): data/countryflags/PK.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/PK.png left in tree.
  53. CONFLICT (delete/modify): data/countryflags/PL.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/PL.png left in tree.
  54. CONFLICT (delete/modify): data/countryflags/PT.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/PT.png left in tree.
  55. CONFLICT (delete/modify): data/countryflags/RO.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/RO.png left in tree.
  56. CONFLICT (delete/modify): data/countryflags/RS.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/RS.png left in tree.
  57. CONFLICT (delete/modify): data/countryflags/RU.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/RU.png left in tree.
  58. CONFLICT (delete/modify): data/countryflags/SA.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/SA.png left in tree.
  59. CONFLICT (delete/modify): data/countryflags/SE.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/SE.png left in tree.
  60. CONFLICT (delete/modify): data/countryflags/SK.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/SK.png left in tree.
  61. CONFLICT (delete/modify): data/countryflags/SV.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/SV.png left in tree.
  62. CONFLICT (delete/modify): data/countryflags/TR.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/TR.png left in tree.
  63. CONFLICT (delete/modify): data/countryflags/UA.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/UA.png left in tree.
  64. CONFLICT (delete/modify): data/countryflags/US.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/US.png left in tree.
  65. CONFLICT (delete/modify): data/countryflags/XEN.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/XEN.png left in tree.
  66. CONFLICT (delete/modify): data/countryflags/XNI.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/XNI.png left in tree.
  67. CONFLICT (delete/modify): data/countryflags/XSC.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/XSC.png left in tree.
  68. CONFLICT (delete/modify): data/countryflags/XWA.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/XWA.png left in tree.
  69. CONFLICT (delete/modify): data/countryflags/ZA.png deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/ZA.png left in tree.
  70. CONFLICT (delete/modify): data/countryflags/index.txt deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/countryflags/index.txt left in tree.
  71. CONFLICT (delete/modify): data/fonts/DejaVuSans.ttf deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of data/fonts/DejaVuSans.ttf left in tree.
  72. Auto-merging datasrc/content.py
  73. CONFLICT (content): Merge conflict in datasrc/content.py
  74. Auto-merging datasrc/network.py
  75. CONFLICT (content): Merge conflict in datasrc/network.py
  76. CONFLICT (delete/modify): license.txt deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of license.txt left in tree.
  77. Auto-merging other/freetype/VERSION
  78. Auto-merging other/freetype/freetype.lua
  79. Auto-merging other/freetype/include/freetype/config/ftconfig.h
  80. Auto-merging other/freetype/include/freetype/config/ftheader.h
  81. Auto-merging other/freetype/include/freetype/config/ftmodule.h
  82. Auto-merging other/freetype/include/freetype/config/ftoption.h
  83. Auto-merging other/freetype/include/freetype/config/ftstdlib.h
  84. Auto-merging other/freetype/include/freetype/freetype.h
  85. Auto-merging other/freetype/include/freetype/ftadvanc.h
  86. Auto-merging other/freetype/include/freetype/ftbbox.h
  87. Auto-merging other/freetype/include/freetype/ftbdf.h
  88. Auto-merging other/freetype/include/freetype/ftbitmap.h
  89. Auto-merging other/freetype/include/freetype/ftcache.h
  90. Auto-merging other/freetype/include/freetype/ftchapters.h
  91. Auto-merging other/freetype/include/freetype/ftcid.h
  92. Auto-merging other/freetype/include/freetype/fterrdef.h
  93. Auto-merging other/freetype/include/freetype/fterrors.h
  94. Auto-merging other/freetype/include/freetype/ftgasp.h
  95. Auto-merging other/freetype/include/freetype/ftglyph.h
  96. Auto-merging other/freetype/include/freetype/ftgxval.h
  97. Auto-merging other/freetype/include/freetype/ftgzip.h
  98. Auto-merging other/freetype/include/freetype/ftimage.h
  99. Auto-merging other/freetype/include/freetype/ftincrem.h
  100. Auto-merging other/freetype/include/freetype/ftlcdfil.h
  101. Auto-merging other/freetype/include/freetype/ftlist.h
  102. Auto-merging other/freetype/include/freetype/ftlzw.h
  103. Auto-merging other/freetype/include/freetype/ftmac.h
  104. Auto-merging other/freetype/include/freetype/ftmm.h
  105. Auto-merging other/freetype/include/freetype/ftmodapi.h
  106. Auto-merging other/freetype/include/freetype/ftmoderr.h
  107. Auto-merging other/freetype/include/freetype/ftotval.h
  108. Auto-merging other/freetype/include/freetype/ftoutln.h
  109. Auto-merging other/freetype/include/freetype/ftpfr.h
  110. Auto-merging other/freetype/include/freetype/ftrender.h
  111. Auto-merging other/freetype/include/freetype/ftsizes.h
  112. Auto-merging other/freetype/include/freetype/ftsnames.h
  113. Auto-merging other/freetype/include/freetype/ftstroke.h
  114. Auto-merging other/freetype/include/freetype/ftsynth.h
  115. Auto-merging other/freetype/include/freetype/ftsystem.h
  116. Auto-merging other/freetype/include/freetype/fttrigon.h
  117. Auto-merging other/freetype/include/freetype/fttypes.h
  118. Auto-merging other/freetype/include/freetype/ftwinfnt.h
  119. Auto-merging other/freetype/include/freetype/ftxf86.h
  120. Auto-merging other/freetype/include/freetype/internal/autohint.h
  121. Auto-merging other/freetype/include/freetype/internal/ftcalc.h
  122. Auto-merging other/freetype/include/freetype/internal/ftdebug.h
  123. Auto-merging other/freetype/include/freetype/internal/ftdriver.h
  124. Auto-merging other/freetype/include/freetype/internal/ftgloadr.h
  125. Auto-merging other/freetype/include/freetype/internal/ftmemory.h
  126. Auto-merging other/freetype/include/freetype/internal/ftobjs.h
  127. Auto-merging other/freetype/include/freetype/internal/ftpic.h
  128. Auto-merging other/freetype/include/freetype/internal/ftrfork.h
  129. Auto-merging other/freetype/include/freetype/internal/ftserv.h
  130. Auto-merging other/freetype/include/freetype/internal/ftstream.h
  131. Auto-merging other/freetype/include/freetype/internal/fttrace.h
  132. Auto-merging other/freetype/include/freetype/internal/ftvalid.h
  133. Auto-merging other/freetype/include/freetype/internal/internal.h
  134. Removing other/freetype/include/freetype/internal/pcftypes.h
  135. Auto-merging other/freetype/include/freetype/internal/psaux.h
  136. Auto-merging other/freetype/include/freetype/internal/pshints.h
  137. Auto-merging other/freetype/include/freetype/internal/services/svbdf.h
  138. Auto-merging other/freetype/include/freetype/internal/services/svcid.h
  139. Auto-merging other/freetype/include/freetype/internal/services/svgldict.h
  140. Auto-merging other/freetype/include/freetype/internal/services/svgxval.h
  141. Auto-merging other/freetype/include/freetype/internal/services/svkern.h
  142. Auto-merging other/freetype/include/freetype/internal/services/svmm.h
  143. Auto-merging other/freetype/include/freetype/internal/services/svotval.h
  144. Auto-merging other/freetype/include/freetype/internal/services/svpfr.h
  145. Auto-merging other/freetype/include/freetype/internal/services/svpostnm.h
  146. Auto-merging other/freetype/include/freetype/internal/services/svpscmap.h
  147. Auto-merging other/freetype/include/freetype/internal/services/svpsinfo.h
  148. Auto-merging other/freetype/include/freetype/internal/services/svsfnt.h
  149. Auto-merging other/freetype/include/freetype/internal/services/svttcmap.h
  150. Auto-merging other/freetype/include/freetype/internal/services/svtteng.h
  151. Auto-merging other/freetype/include/freetype/internal/services/svttglyf.h
  152. Auto-merging other/freetype/include/freetype/internal/services/svwinfnt.h
  153. Auto-merging other/freetype/include/freetype/internal/services/svxf86nm.h
  154. Auto-merging other/freetype/include/freetype/internal/sfnt.h
  155. Auto-merging other/freetype/include/freetype/internal/t1types.h
  156. Auto-merging other/freetype/include/freetype/internal/tttypes.h
  157. Auto-merging other/freetype/include/freetype/t1tables.h
  158. Auto-merging other/freetype/include/freetype/ttnameid.h
  159. Auto-merging other/freetype/include/freetype/tttables.h
  160. Auto-merging other/freetype/include/freetype/tttags.h
  161. Auto-merging other/freetype/include/freetype/ttunpat.h
  162. Auto-merging other/freetype/include/ft2build.h
  163. Removing other/freetype/lib/freetype.dll
  164. Removing other/freetype/lib/freetype.lib
  165. Auto-merging other/sdl/sdl.lua
  166. 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.
  167. 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.
  168. 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.
  169. CONFLICT (delete/modify): readme.txt deleted in HEAD and modified in 8372849cbafb02a58fcf8aa7c706cad5c5f16731. Version 8372849cbafb02a58fcf8aa7c706cad5c5f16731 of readme.txt left in tree.
  170. Auto-merging scripts/build.py
  171. Auto-merging scripts/cmd5.py
  172. CONFLICT (content): Merge conflict in scripts/cmd5.py
  173. Auto-merging scripts/make_release.py
  174. Removing scripts/update_localization.py
  175. Auto-merging src/base/detect.h
  176. CONFLICT (content): Merge conflict in src/base/detect.h
  177. Auto-merging src/base/system.c
  178. CONFLICT (content): Merge conflict in src/base/system.c
  179. Auto-merging src/base/system.h
  180. Auto-merging src/base/vmath.h
  181. Auto-merging src/engine/client.h
  182. Auto-merging src/engine/client/client.cpp
  183. CONFLICT (content): Merge conflict in src/engine/client/client.cpp
  184. Auto-merging src/engine/client/client.h
  185. Auto-merging src/engine/client/friends.cpp
  186. Auto-merging src/engine/client/graphics.cpp
  187. CONFLICT (content): Merge conflict in src/engine/client/graphics.cpp
  188. Auto-merging src/engine/client/graphics.h
  189. Auto-merging src/engine/client/input.cpp
  190. Auto-merging src/engine/client/serverbrowser.cpp
  191. CONFLICT (content): Merge conflict in src/engine/client/serverbrowser.cpp
  192. Auto-merging src/engine/client/sound.cpp
  193. CONFLICT (content): Merge conflict in src/engine/client/sound.cpp
  194. Auto-merging src/engine/client/text.cpp
  195. Auto-merging src/engine/console.h
  196. Auto-merging src/engine/demo.h
  197. Auto-merging src/engine/docs/client_time.txt
  198. Auto-merging src/engine/docs/prediction.txt
  199. Auto-merging src/engine/docs/server_op.txt
  200. Auto-merging src/engine/docs/snapshots.txt
  201. Auto-merging src/engine/external/zlib/VERSION
  202. Auto-merging src/engine/external/zlib/adler32.c
  203. Auto-merging src/engine/external/zlib/compress.c
  204. Auto-merging src/engine/external/zlib/crc32.c
  205. Auto-merging src/engine/external/zlib/deflate.c
  206. Auto-merging src/engine/external/zlib/deflate.h
  207. Removing src/engine/external/zlib/gzio.c
  208. Auto-merging src/engine/external/zlib/infback.c
  209. Auto-merging src/engine/external/zlib/inffast.c
  210. Auto-merging src/engine/external/zlib/inffast.h
  211. Auto-merging src/engine/external/zlib/inflate.c
  212. Auto-merging src/engine/external/zlib/inflate.h
  213. Auto-merging src/engine/external/zlib/inftrees.c
  214. Auto-merging src/engine/external/zlib/inftrees.h
  215. Auto-merging src/engine/external/zlib/trees.c
  216. Auto-merging src/engine/external/zlib/trees.h
  217. Auto-merging src/engine/external/zlib/uncompr.c
  218. Auto-merging src/engine/external/zlib/zconf.h
  219. Removing src/engine/external/zlib/zconf.in.h
  220. Auto-merging src/engine/external/zlib/zlib.h
  221. Auto-merging src/engine/external/zlib/zutil.c
  222. Auto-merging src/engine/external/zlib/zutil.h
  223. Auto-merging src/engine/graphics.h
  224. CONFLICT (content): Merge conflict in src/engine/graphics.h
  225. Auto-merging src/engine/input.h
  226. Auto-merging src/engine/masterserver.h
  227. Auto-merging src/engine/server.h
  228. CONFLICT (content): Merge conflict in src/engine/server.h
  229. Auto-merging src/engine/server/register.cpp
  230. Auto-merging src/engine/server/server.cpp
  231. CONFLICT (content): Merge conflict in src/engine/server/server.cpp
  232. Auto-merging src/engine/server/server.h
  233. CONFLICT (content): Merge conflict in src/engine/server/server.h
  234. Auto-merging src/engine/serverbrowser.h
  235. Auto-merging src/engine/shared/config.cpp
  236. Auto-merging src/engine/shared/config.h
  237. Auto-merging src/engine/shared/config_variables.h
  238. CONFLICT (content): Merge conflict in src/engine/shared/config_variables.h
  239. Auto-merging src/engine/shared/console.cpp
  240. CONFLICT (content): Merge conflict in src/engine/shared/console.cpp
  241. Auto-merging src/engine/shared/console.h
  242. CONFLICT (content): Merge conflict in src/engine/shared/console.h
  243. Auto-merging src/engine/shared/datafile.cpp
  244. Auto-merging src/engine/shared/datafile.h
  245. Auto-merging src/engine/shared/demo.cpp
  246. Auto-merging src/engine/shared/demo.h
  247. Auto-merging src/engine/shared/econ.cpp
  248. CONFLICT (add/add): Merge conflict in src/engine/shared/econ.cpp
  249. Auto-merging src/engine/shared/econ.h
  250. CONFLICT (add/add): Merge conflict in src/engine/shared/econ.h
  251. Auto-merging src/engine/shared/filecollection.cpp
  252. CONFLICT (add/add): Merge conflict in src/engine/shared/filecollection.cpp
  253. Auto-merging src/engine/shared/filecollection.h
  254. CONFLICT (add/add): Merge conflict in src/engine/shared/filecollection.h
  255. Auto-merging src/engine/shared/masterserver.cpp
  256. CONFLICT (content): Merge conflict in src/engine/shared/masterserver.cpp
  257. Auto-merging src/engine/shared/memheap.cpp
  258. Auto-merging src/engine/shared/memheap.h
  259. Auto-merging src/engine/shared/network.cpp
  260. Auto-merging src/engine/shared/network.h
  261. CONFLICT (content): Merge conflict in src/engine/shared/network.h
  262. Auto-merging src/engine/shared/network_client.cpp
  263. Auto-merging src/engine/shared/network_conn.cpp
  264. Auto-merging src/engine/shared/network_console.cpp
  265. CONFLICT (add/add): Merge conflict in src/engine/shared/network_console.cpp
  266. Auto-merging src/engine/shared/network_console_conn.cpp
  267. CONFLICT (add/add): Merge conflict in src/engine/shared/network_console_conn.cpp
  268. Auto-merging src/engine/shared/network_server.cpp
  269. CONFLICT (content): Merge conflict in src/engine/shared/network_server.cpp
  270. Auto-merging src/engine/shared/protocol.h
  271. CONFLICT (content): Merge conflict in src/engine/shared/protocol.h
  272. Auto-merging src/engine/shared/storage.cpp
  273. CONFLICT (content): Merge conflict in src/engine/shared/storage.cpp
  274. Auto-merging src/engine/sound.h
  275. Auto-merging src/engine/storage.h
  276. Auto-merging src/game/client/components/binds.cpp
  277. Auto-merging src/game/client/components/chat.cpp
  278. Auto-merging src/game/client/components/chat.h
  279. Auto-merging src/game/client/components/console.cpp
  280. CONFLICT (content): Merge conflict in src/game/client/components/console.cpp
  281. Auto-merging src/game/client/components/console.h
  282. Auto-merging src/game/client/components/controls.cpp
  283. Auto-merging src/game/client/components/countryflags.cpp
  284. CONFLICT (content): Merge conflict in src/game/client/components/countryflags.cpp
  285. Auto-merging src/game/client/components/countryflags.h
  286. Auto-merging src/game/client/components/damageind.cpp
  287. Auto-merging src/game/client/components/damageind.h
  288. Auto-merging src/game/client/components/effects.cpp
  289. Auto-merging src/game/client/components/emoticon.cpp
  290. CONFLICT (content): Merge conflict in src/game/client/components/emoticon.cpp
  291. Auto-merging src/game/client/components/hud.cpp
  292. CONFLICT (content): Merge conflict in src/game/client/components/hud.cpp
  293. Auto-merging src/game/client/components/hud.h
  294. Auto-merging src/game/client/components/items.cpp
  295. CONFLICT (content): Merge conflict in src/game/client/components/items.cpp
  296. Auto-merging src/game/client/components/items.h
  297. Auto-merging src/game/client/components/maplayers.cpp
  298. Auto-merging src/game/client/components/maplayers.h
  299. Auto-merging src/game/client/components/menus.cpp
  300. CONFLICT (content): Merge conflict in src/game/client/components/menus.cpp
  301. Auto-merging src/game/client/components/menus.h
  302. Auto-merging src/game/client/components/menus_browser.cpp
  303. CONFLICT (content): Merge conflict in src/game/client/components/menus_browser.cpp
  304. Auto-merging src/game/client/components/menus_demo.cpp
  305. Auto-merging src/game/client/components/menus_ingame.cpp
  306. CONFLICT (content): Merge conflict in src/game/client/components/menus_ingame.cpp
  307. Auto-merging src/game/client/components/menus_settings.cpp
  308. CONFLICT (content): Merge conflict in src/game/client/components/menus_settings.cpp
  309. Auto-merging src/game/client/components/particles.cpp
  310. Auto-merging src/game/client/components/players.cpp
  311. CONFLICT (content): Merge conflict in src/game/client/components/players.cpp
  312. Auto-merging src/game/client/components/players.h
  313. Auto-merging src/game/client/components/scoreboard.cpp
  314. Auto-merging src/game/client/components/skins.cpp
  315. Auto-merging src/game/client/components/skins.h
  316. Auto-merging src/game/client/components/sounds.cpp
  317. Auto-merging src/game/client/components/sounds.h
  318. Auto-merging src/game/client/components/spectator.cpp
  319. Auto-merging src/game/client/components/voting.cpp
  320. Auto-merging src/game/client/gameclient.cpp
  321. CONFLICT (content): Merge conflict in src/game/client/gameclient.cpp
  322. Auto-merging src/game/client/gameclient.h
  323. Auto-merging src/game/client/lineinput.cpp
  324. Auto-merging src/game/client/render.cpp
  325. Auto-merging src/game/client/render.h
  326. Auto-merging src/game/client/render_map.cpp
  327. Auto-merging src/game/client/ui.cpp
  328. Auto-merging src/game/client/ui.h
  329. Auto-merging src/game/editor/auto_map.cpp
  330. CONFLICT (add/add): Merge conflict in src/game/editor/auto_map.cpp
  331. Auto-merging src/game/editor/auto_map.h
  332. CONFLICT (add/add): Merge conflict in src/game/editor/auto_map.h
  333. Auto-merging src/game/editor/editor.cpp
  334. CONFLICT (content): Merge conflict in src/game/editor/editor.cpp
  335. Auto-merging src/game/editor/editor.h
  336. Auto-merging src/game/editor/io.cpp
  337. Auto-merging src/game/editor/layer_game.cpp
  338. Auto-merging src/game/editor/layer_quads.cpp
  339. Auto-merging src/game/editor/layer_tiles.cpp
  340. Auto-merging src/game/editor/popups.cpp
  341. CONFLICT (content): Merge conflict in src/game/editor/popups.cpp
  342. Auto-merging src/game/gamecore.cpp
  343. Auto-merging src/game/layers.cpp
  344. Auto-merging src/game/mapitems.h
  345. CONFLICT (content): Merge conflict in src/game/mapitems.h
  346. Auto-merging src/game/server/entities/character.cpp
  347. CONFLICT (content): Merge conflict in src/game/server/entities/character.cpp
  348. Auto-merging src/game/server/entities/character.h
  349. Auto-merging src/game/server/entities/flag.cpp
  350. Auto-merging src/game/server/entities/flag.h
  351. Auto-merging src/game/server/entities/laser.cpp
  352. CONFLICT (content): Merge conflict in src/game/server/entities/laser.cpp
  353. Auto-merging src/game/server/entities/laser.h
  354. Auto-merging src/game/server/entities/pickup.cpp
  355. CONFLICT (content): Merge conflict in src/game/server/entities/pickup.cpp
  356. Auto-merging src/game/server/entities/pickup.h
  357. Auto-merging src/game/server/entities/projectile.cpp
  358. Auto-merging src/game/server/entities/projectile.h
  359. Auto-merging src/game/server/entity.cpp
  360. Auto-merging src/game/server/entity.h
  361. Auto-merging src/game/server/eventhandler.cpp
  362. Auto-merging src/game/server/gamecontext.cpp
  363. CONFLICT (content): Merge conflict in src/game/server/gamecontext.cpp
  364. Auto-merging src/game/server/gamecontext.h
  365. Auto-merging src/game/server/gamecontroller.cpp
  366. CONFLICT (content): Merge conflict in src/game/server/gamecontroller.cpp
  367. Auto-merging src/game/server/gamecontroller.h
  368. CONFLICT (content): Merge conflict in src/game/server/gamecontroller.h
  369. Auto-merging src/game/server/gamemodes/ctf.cpp
  370. CONFLICT (content): Merge conflict in src/game/server/gamemodes/ctf.cpp
  371. Auto-merging src/game/server/gamemodes/ctf.h
  372. CONFLICT (content): Merge conflict in src/game/server/gamemodes/ctf.h
  373. Auto-merging src/game/server/gamemodes/dm.cpp
  374. Auto-merging src/game/server/gamemodes/dm.h
  375. Auto-merging src/game/server/gamemodes/tdm.cpp
  376. Auto-merging src/game/server/gamemodes/tdm.h
  377. Auto-merging src/game/server/gameworld.cpp
  378. Auto-merging src/game/server/player.cpp
  379. CONFLICT (content): Merge conflict in src/game/server/player.cpp
  380. Auto-merging src/game/server/player.h
  381. Auto-merging src/game/variables.h
  382. Auto-merging src/game/version.h
  383. CONFLICT (content): Merge conflict in src/game/version.h
  384. Auto-merging src/mastersrv/mastersrv.cpp
  385. Auto-merging src/tools/crapnet.cpp
  386. Auto-merging src/tools/dilate.cpp
  387. Auto-merging src/tools/fake_server.cpp
  388. Auto-merging src/tools/map_resave.cpp
  389. Auto-merging src/tools/map_version.cpp
  390. Auto-merging src/tools/tileset_borderfix.cpp
  391. Auto-merging src/versionsrv/versionsrv.cpp
  392. Auto-merging src/versionsrv/versionsrv.h
  393. Automatic merge failed; fix conflicts and then commit the result.
  394.  

Reply to "Untitled"

Here you can reply to the paste above

Powered by Stikked