Allow g_new_toys_autoreplace to be changed without affecting purity (it's a preferenc...

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 5a5c28047009e11e9d1d1e1ccd3d041531dc59e4..aed016f743542b9333181caa241701e6cce23691 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Jul  9 07:24:10 CEST 2018
+Fri Aug 30 07:24:34 CEST 2019