Download changes from transifex.

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 71496b639cb306e57843b65a7f772cf020c2714e..40970e2c1af4ac7089c854d1bcf6c909e6d3bbac 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Dec 30 12:52:40 CET 2014
+Tue Oct 13 21:13:27 CEST 2015