Merge branch 'master' into martin-t/uncrustify

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 9893524f6ee2a6c7f9b3f26d2ab7069a3d49da7c..efe8262cb690e24a55eb2e0ea36348e8f7685b5d 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Mar 30 07:24:50 CEST 2017
+Sat Jul  8 07:24:47 CEST 2017