Merged master.

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

diff --git a/.tx/merge-base b/.tx/merge-base
index ee0ac25b5697589d6ce7d166acc0cfb0ae65048b..efe8262cb690e24a55eb2e0ea36348e8f7685b5d 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat May 20 07:24:00 CEST 2017
+Sat Jul  8 07:24:47 CEST 2017