Menu: don't wire up some settings to the "Apply immediately" button since menu can...

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 59377548dbc3879b865d58416167a7f2c8e1dcf7..27d0db5ace70b7062d64d3138ea86384f87ba81f 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Apr 22 07:24:17 CEST 2019
+Tue Jul 30 07:24:47 CEST 2019