X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=aaade5f752afc2314c43225e618bd799b63a3022;hb=412f4a42d4403686809473b79b52c26039f73492;hp=0a00903ed69ad9be72c6923171615addb28d9779;hpb=fb9a89e4cbc02dd50814972bb1c329908dc127a0;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 0a00903ed..aaade5f75 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Sep 13 11:00:37 CEST 2013
+Tue Jan 13 19:44:31 CET 2015