Merge branch 'terencehill/weapon_decals_fix' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 82572a251ec6bd5c2b1c0447aabe6d1612e5b897..324a74c035a73eaed64e84fc0acd8447d585f6d6 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Nov  3 07:23:29 CET 2022
+Tue Dec 27 07:23:39 CET 2022