Merge branch 't0uYK8Ne/target_init' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 3deea699e07ef4dc07dcebab404c926355ed0bf2..c0ddb1d5fcf165824eec0aa7cb56ef6d8153110a 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Mar  7 19:43:03 CET 2017
+Wed Feb 14 07:23:42 CET 2018