Fix #2727 "New esc-menu shouldn't open a standard settings page"

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 3fc3d5a5afb85edb8c493ab701e20801fe814ade..41c9adcc8168d09407b8228327c1a7292f321edc 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Apr  6 07:23:10 CEST 2022
+Thu Jul 28 07:23:07 CEST 2022