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 1af935744d2eb1ca66a1ae19879788112dd826f0..aaade5f752afc2314c43225e618bd799b63a3022 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Sep 13 11:09:31 CEST 2013
+Tue Jan 13 19:44:31 CET 2015