Merge branch 'master' into Mario/weapons

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 1defbff2760f7026bc6ffe09a6d253be67bb592c..a517ba03f14a4147d472872428ddb4e51b1b68fe 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Sep 13 21:26:35 CEST 2013
+Wed Jun  4 16:12:08 CEST 2014