Merge branch 'maint' (early part before Transifex)

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 0d2f0c2939c18d4cd346221e800576213bce67b1..cd53b6c9fab9227ddd1dfe27201e2535bf4f177a 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Jan 11 07:37:55 CET 2015
+Thu Aug 20 01:26:52 CEST 2015