X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=b2b2ddca631fe972b7a6fe63d6ecdf789d678128;hb=e9815ad279dc61506e5e65c34348fa7dcc570b9e;hp=db68ce74750b6e9d0ff3ab5b5d7502b8292c6d8f;hpb=18e2cd311a581f77ba8eb9c5421dd219ff5d760d;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index db68ce747..b2b2ddca6 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Oct 13 21:18:19 CEST 2015
+Fri Jan 15 22:48:00 CET 2016