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

diff --git a/.tx/merge-base b/.tx/merge-base
index 699ec31da..d03c707af 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Oct 14 01:54:07 CEST 2015
+Tue May 10 21:52:13 CEST 2016