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

diff --git a/.tx/merge-base b/.tx/merge-base
index b274f04ae..aaade5f75 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Feb 14 13:26:38 CET 2014
+Tue Jan 13 19:44:31 CET 2015