Link .clipgroup with CSQC on networked models so that collision matches in engines...

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

diff --git a/.tx/merge-base b/.tx/merge-base
index d89ad5cbefe69855899a645ea0fb4d24faf439f4..35c8b68c6c7dbc1b6e4819a8915f4fea25bb6b98 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Feb  8 07:24:17 CET 2020
+Thu Jul 16 07:23:56 CEST 2020