X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=a517ba03f14a4147d472872428ddb4e51b1b68fe;hb=7b15197339e0263e56a6684f8a1b3890ba6d367b;hp=b274f04ae1736e9b4d0aad58d732e55abba70a88;hpb=38ec1ced498dbd79153c50b73f0a3df4455919f4;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