X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=699ec31da5d12b5258b2fedf33858473aef493bd;hb=eb11812570ce32dde588683712c152ad600b99c6;hp=a51d6f860b002801ebdf40aa9d0f98861ffec88c;hpb=6662b1587ca7fda471d5af054b459d485ceacf7c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index a51d6f860..699ec31da 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Aug 20 01:29:32 CEST 2015
+Wed Oct 14 01:54:07 CEST 2015