Merge branch 'Lyberta/KillSound' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 78881919c1ef8366f801fd8dd347bf2ca6711ed3..53527f3c728703d8d1aa6e9f5fc126198c7d0dbf 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Apr 30 07:23:39 CEST 2017
+Fri Apr 20 07:23:54 CEST 2018