Merge branch 'bones_was_here/qcsrc_Makefile' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 4b64ea073cc7e8ffe7ef2f5f159190eacb7af617..5b06a0a0cde26368091c50c782acf79570908041 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Oct  4 07:24:32 CEST 2019
+Sat Jun 13 07:23:44 CEST 2020