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 a517ba03f14a4147d472872428ddb4e51b1b68fe..cd53b6c9fab9227ddd1dfe27201e2535bf4f177a 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jun  4 16:12:08 CEST 2014
+Thu Aug 20 01:26:52 CEST 2015