X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=c8dff0e9fb7717c025d78b08782f1edeb471cd85;hb=a09be801d597c12bb76e466440c00afa2854027b;hp=a73edd9b09c1d382e82a78349f2295a1dbbbd4e6;hpb=c3fd825a782c1a8f33c26e171218b4bf2a679763;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index a73edd9b0..c8dff0e9f 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Jun  3 07:23:47 CEST 2017
+Sat Feb 10 07:23:38 CET 2018