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

diff --git a/.tx/merge-base b/.tx/merge-base
index 1defbff27..a517ba03f 100644
--- 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