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

diff --git a/.tx/merge-base b/.tx/merge-base
index 622a8f71d..aaade5f75 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Dec 31 20:47:05 CET 2013
+Tue Jan 13 19:44:31 CET 2015