X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=aaade5f752afc2314c43225e618bd799b63a3022;hp=881da7bafcaeafd12f6a8af171de6a57cdcac80c;hb=253cc10990569fd90917dba809ce03c90fc89336;hpb=d3726dc851cf78ec77ca6aa51182079c5b84ec19

diff --git a/.tx/merge-base b/.tx/merge-base
index 881da7bafc..aaade5f752 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Dec 30 12:25:09 CET 2014
+Tue Jan 13 19:44:31 CET 2015