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

diff --git a/.tx/merge-base b/.tx/merge-base
index aaade5f75..40970e2c1 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Jan 13 19:44:31 CET 2015
+Tue Oct 13 21:13:27 CEST 2015