X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=aaade5f752afc2314c43225e618bd799b63a3022;hb=f12e0d90c7d266d2b899ecb9c7a3eb6ffaeb3282;hp=bcae3725c0b24dce57f350cd7d14e6d243f4f0bd;hpb=f1bfec505b6d38f313926134f06c9b45f019bb32;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index bcae3725c..aaade5f75 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Jan  9 08:52:34 CET 2015
+Tue Jan 13 19:44:31 CET 2015