X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=a517ba03f14a4147d472872428ddb4e51b1b68fe;hb=fe8c0d80cf9b75024b33d565770f5e10ff956376;hp=fa97f6f95163f1e6c766bf3fda1093ccb3d03b89;hpb=9120a47f091b6e2d0f5bb48914443b6dbd6c417d;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index fa97f6f95..a517ba03f 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Oct  4 13:03:13 CEST 2013
+Wed Jun  4 16:12:08 CEST 2014