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

diff --git a/.tx/merge-base b/.tx/merge-base
index aaade5f75..699ec31da 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Jan 13 19:44:31 CET 2015
+Wed Oct 14 01:54:07 CEST 2015