X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=ea94b9d5ddce9866b4fed3ad6f68a9d641ef1b05;hb=fd1db0751352e8b2428a07557caa80ce6c913509;hp=a517ba03f14a4147d472872428ddb4e51b1b68fe;hpb=3adaa0873ad9eac20f32e6e3fc0455d4f9e044cd;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index a517ba03f..ea94b9d5d 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jun  4 16:12:08 CEST 2014
+Wed Dec 31 22:24:30 CET 2014