Merge branch 'master' into Lyberta/KillSound

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

diff --git a/.tx/merge-base b/.tx/merge-base
index ee5586a6fb73020e19402817433431d738fc67bd..c8dff0e9fb7717c025d78b08782f1edeb471cd85 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Apr 13 07:23:35 CEST 2017
+Sat Feb 10 07:23:38 CET 2018