tx synC

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

diff --git a/.tx/merge-base b/.tx/merge-base
index aaade5f752afc2314c43225e618bd799b63a3022..d03c707af970540f1b97e8909029f4fb086f3843 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Jan 13 19:44:31 CET 2015
+Tue May 10 21:52:13 CEST 2016