X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=699ec31da5d12b5258b2fedf33858473aef493bd;hb=31f6ab4bb689aac5e84830cb5ea3aa3966ebc140;hp=cd53b6c9fab9227ddd1dfe27201e2535bf4f177a;hpb=0b7855b8e65e0220238a08cdcdd2ca7386e3d06e;p=xonotic%2Fxonotic-data.pk3dir.git

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