Merge branch 'master' into martin-t/dmgtext2

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

diff --git a/.tx/merge-base b/.tx/merge-base
index db68ce74750b6e9d0ff3ab5b5d7502b8292c6d8f..a7a8f8175b3b5abfc747eed09b3a9f9610e742f3 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Oct 13 21:18:19 CEST 2015
+Fri May 26 07:23:54 CEST 2017