Add a note to zscale and default it to 1 in RadiusDamage

[xonotic/xonotic-data.pk3dir.git] / .tx / merge-base

diff --git a/.tx/merge-base b/.tx/merge-base
index ecaa77f6e785c09163db014b357b06ede206c671..27d0db5ace70b7062d64d3138ea86384f87ba81f 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jan 30 07:24:21 CET 2019
+Tue Jul 30 07:24:47 CEST 2019