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 085b2a6b6fec31d710d7d121d2eb875fda593afb..aed016f743542b9333181caa241701e6cce23691 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Jul 14 07:25:36 CEST 2019
+Fri Aug 30 07:24:34 CEST 2019