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 f5e13c065874b2bb73ce52ad7e1d6edb3a630cac..aed016f743542b9333181caa241701e6cce23691 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Dec 25 07:24:03 CET 2018
+Fri Aug 30 07:24:34 CEST 2019