Merge branch 'master' into Mario/model_stair_smoothing

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

diff --git a/.tx/merge-base b/.tx/merge-base
index ef2b4ce1a7d551e23360d7abe892a82afce85f8c..eb5d63f9457da500dfad22d7627d1c866d438f9d 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Jul  7 07:23:45 CEST 2020
+Mon Oct 19 07:23:41 CEST 2020