tx synC

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

diff --git a/.tx/merge-base b/.tx/merge-base
index b0c891bbe5a7864b64d51f6a4f719d66c54d03ac..d03c707af970540f1b97e8909029f4fb086f3843 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Aug 31 21:02:59 CEST 2015
+Tue May 10 21:52:13 CEST 2016