X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=.tx%2Fmerge-base;h=d03c707af970540f1b97e8909029f4fb086f3843;hb=79ac16b4fa8de57c87c07b89999e7803e528e3f0;hp=aaade5f752afc2314c43225e618bd799b63a3022;hpb=ee32da5f4dafee5883369c759fe8ed042114bda5;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index aaade5f75..d03c707af 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Jan 13 19:44:31 CET 2015
+Tue May 10 21:52:13 CEST 2016