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

diff --git a/.tx/merge-base b/.tx/merge-base
index 9322cbe40..41092cd20 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Aug  8 12:41:53 CEST 2015
+Mon Dec 28 22:25:00 CET 2015