Resolve merge conflict for #1807

This commit is contained in:
ebaydayz
2016-12-05 14:40:21 -05:00
parent 5058308f00
commit 1bb76d2d22

View File

@@ -1,6 +1,7 @@
[FIXED] Wrong texture for z_hunter zombie. #1805 @schwanzkopfhegel @ebayShopper
[FIXED] Refuel with generator at gas station not working. #1806 @Helios27 @ebayShopper
[FIXED] Issue where Arma cheats could still be entered under certain conditions without pressing LeftShift at the same time as NumPadMinus. @ebayShopper
[FIXED] Tag friendly still showing after player accepts and related issue with BackpackAntiTheft. #1807 @oiad
[FIXED] Undefined variable dayz_clientPreload error on main menu during intro.sqs. #1810 @ndavalos @ebayShopper
[INFO] See Documents\CHANGE LOG 1.0.6.txt for the full list of 1.0.5.1 --> 1.0.6 changes.