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

diff --git a/.tx/merge-base b/.tx/merge-base
index a517ba03f..699ec31da 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jun  4 16:12:08 CEST 2014
+Wed Oct 14 01:54:07 CEST 2015