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 7a7217d2572f0e8dc33ec3ff45b2c40937084d67..35c8b68c6c7dbc1b6e4819a8915f4fea25bb6b98 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jan 15 07:24:54 CET 2020
+Thu Jul 16 07:23:56 CEST 2020