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

diff --git a/.tx/merge-base b/.tx/merge-base
index a517ba03f..aaade5f75 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jun  4 16:12:08 CEST 2014
+Tue Jan 13 19:44:31 CET 2015