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 a517ba03f14a4147d472872428ddb4e51b1b68fe..d03c707af970540f1b97e8909029f4fb086f3843 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jun  4 16:12:08 CEST 2014
+Tue May 10 21:52:13 CEST 2016