Display name and description of customized vote options

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 0a00903ed69ad9be72c6923171615addb28d9779..aaade5f752afc2314c43225e618bd799b63a3022 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Sep 13 11:00:37 CEST 2013
+Tue Jan 13 19:44:31 CET 2015