Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 1defbff2760f7026bc6ffe09a6d253be67bb592c..fc9cb6ac1c5a04acf2701d0f8c28007055f3ec55 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Sep 13 21:26:35 CEST 2013
+Sat Jan 18 14:52:20 CET 2014