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 99d127cbd61dbcc4cf809204e97c02d821d74f9e..35c8b68c6c7dbc1b6e4819a8915f4fea25bb6b98 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Jun  6 07:23:41 CEST 2020
+Thu Jul 16 07:23:56 CEST 2020