Remove definition of a server cvar from the menu

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

diff --git a/.tx/merge-base b/.tx/merge-base
index fc9cb6ac1c5a04acf2701d0f8c28007055f3ec55..d03c707af970540f1b97e8909029f4fb086f3843 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Jan 18 14:52:20 CET 2014
+Tue May 10 21:52:13 CEST 2016