X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=d03c707af970540f1b97e8909029f4fb086f3843;hp=cd53b6c9fab9227ddd1dfe27201e2535bf4f177a;hb=0c80664132da9b0ccd09fef46d220febe52e84d2;hpb=8b38ad6987192a2129a7aa55410fd6d729425a28

diff --git a/.tx/merge-base b/.tx/merge-base
index cd53b6c9fa..d03c707af9 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Aug 20 01:26:52 CEST 2015
+Tue May 10 21:52:13 CEST 2016