Don't show a trace log for client-side damage dealt

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

diff --git a/.tx/merge-base b/.tx/merge-base
index d795790ea67bc092e05c23ce192699edd502f2d3..249da913339d42b751c0a2e1cbce7859e813b386 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri May 24 07:24:30 CEST 2019
+Thu Dec 19 07:25:06 CET 2019