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

diff --git a/.tx/merge-base b/.tx/merge-base
index 0d2f0c293..aaade5f75 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Jan 11 07:37:55 CET 2015
+Tue Jan 13 19:44:31 CET 2015