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 3dfd538ed89000fbdcf186eb03fbbbab05ce77d8..27d0db5ace70b7062d64d3138ea86384f87ba81f 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Dec 18 07:24:08 CET 2018
+Tue Jul 30 07:24:47 CEST 2019