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

diff --git a/.tx/merge-base b/.tx/merge-base
index fd366f8eb..aaade5f75 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Oct  4 13:06:47 CEST 2013
+Tue Jan 13 19:44:31 CET 2015