X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=40970e2c1af4ac7089c854d1bcf6c909e6d3bbac;hb=1b9c4091ae485ecc1cfeb02445db5183299f80a3;hp=a51d6f860b002801ebdf40aa9d0f98861ffec88c;hpb=992501b9bf8a5c942b35147c0b9225a3ebf88799;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index a51d6f860..40970e2c1 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Aug 20 01:29:32 CEST 2015
+Tue Oct 13 21:13:27 CEST 2015