Merge branch 'martin-t/wr_init' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index e4e87d29fe63b53cf54d4dd2c04cd79b243cd0ff..c0a2b39ecd916bb1931cac412e76147f2a9c1cb0 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Dec 17 07:24:12 CET 2018
+Mon Jul 15 07:24:31 CEST 2019