Merge remote-tracking branch 'origin/Mario/train_fix'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index fd366f8ebd6aadbf77fcdc0748db5b744e8f3518..b274f04ae1736e9b4d0aad58d732e55abba70a88 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Oct  4 13:06:47 CEST 2013
+Fri Feb 14 13:26:38 CET 2014