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 2421774a9159f425b8efd4f26641a6ca250a489b..a7a8f8175b3b5abfc747eed09b3a9f9610e742f3 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed May 17 07:24:21 CEST 2017
+Fri May 26 07:23:54 CEST 2017