Merge branch 'terencehill/noclip_death_fix' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 99d3daba257590ee6f6a14a9dbe82bb25b6f918c..037aa1c8127233f7b1b7485dc30e069e40b60419 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Jul 17 07:23:57 CEST 2020
+Sat Jul 18 07:23:53 CEST 2020