X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=.tx%2Fmerge-base;h=87d4e9aa2f08e869d25154c89e22c3a7d6e401ec;hb=a970792ed2a2fdeb8742bafeea321e86790408cb;hp=f7e1fc243a25740a9e332b1c022c8fae815db1e1;hpb=7d7934c935e9ae899774c16954a7c1de91bc3291;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index f7e1fc243..87d4e9aa2 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Jun  2 07:24:20 CEST 2018
+Tue Jan 29 07:24:13 CET 2019