X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=.tx%2Fmerge-base;h=aaade5f752afc2314c43225e618bd799b63a3022;hb=412f4a42d4403686809473b79b52c26039f73492;hp=1af935744d2eb1ca66a1ae19879788112dd826f0;hpb=72226cf8ee17c96e430e57e95bc56f787a80c517;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 1af935744..aaade5f75 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Sep 13 11:09:31 CEST 2013
+Tue Jan 13 19:44:31 CET 2015