Merge remote-tracking branch 'origin/samual/serverlist'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 1af935744d2eb1ca66a1ae19879788112dd826f0..fd366f8ebd6aadbf77fcdc0748db5b744e8f3518 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Sep 13 11:09:31 CEST 2013
+Fri Oct  4 13:06:47 CEST 2013