X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=ba83f7ff83e3ef8a77b7601b135a4f3940a7dd77;hp=c8dff0e9fb7717c025d78b08782f1edeb471cd85;hb=ec04dfbf07e047ea23638f213bbdb1c47316b364;hpb=531fa1eb217365d964f726f2c818db8db9cd9a7f

diff --git a/.tx/merge-base b/.tx/merge-base
index c8dff0e9fb..ba83f7ff83 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Feb 10 07:23:38 CET 2018
+Tue Jul 10 07:24:23 CEST 2018