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

diff --git a/.tx/merge-base b/.tx/merge-base
index cd53b6c9f..41092cd20 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Aug 20 01:26:52 CEST 2015
+Mon Dec 28 22:25:00 CET 2015