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

diff --git a/.tx/merge-base b/.tx/merge-base
index 9322cbe40..cd53b6c9f 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Aug  8 12:41:53 CEST 2015
+Thu Aug 20 01:26:52 CEST 2015