X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=1164ee85ff98fe51431eb85526f70f37d06a6b53;hp=cd53b6c9fab9227ddd1dfe27201e2535bf4f177a;hb=ecb0b6500f0b8c6024b654f23209940a9f1684b2;hpb=785232fc90ed7bd7038c79f65534a7e79efd7f45

diff --git a/.tx/merge-base b/.tx/merge-base
index cd53b6c9fa..1164ee85ff 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Aug 20 01:26:52 CEST 2015
+Wed Apr  5 07:23:38 CEST 2017