X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=a517ba03f14a4147d472872428ddb4e51b1b68fe;hb=af818d85ab5246b8ecd1743ecf808d39e4396445;hp=b274f04ae1736e9b4d0aad58d732e55abba70a88;hpb=23ad6cc4775660c14ef42575146550887f44775e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index b274f04ae..a517ba03f 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Feb 14 13:26:38 CET 2014
+Wed Jun  4 16:12:08 CEST 2014