Merge remote-tracking branch 'origin/mrbougo/clonefixes'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index f78e6e247e48867d44d1451efcb036ba4cadfe59..0d2f0c2939c18d4cd346221e800576213bce67b1 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Dec 21 07:51:44 CET 2014
+Sun Jan 11 07:37:55 CET 2015