X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=0d2f0c2939c18d4cd346221e800576213bce67b1;hb=c8148c32509bf9acc7106b9565cbc6627f726ce7;hp=a517ba03f14a4147d472872428ddb4e51b1b68fe;hpb=75f257c5016b7a4bf92a2c737a81273d6b258371;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index a517ba03f..0d2f0c293 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jun  4 16:12:08 CEST 2014
+Sun Jan 11 07:37:55 CET 2015