X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=b274f04ae1736e9b4d0aad58d732e55abba70a88;hp=45b2986479a9572866eecfff3cad8dbc672374a1;hb=cff9142d7732b7722fc7878fa6a98a4548823e43;hpb=392f91e7e1757d9e103183dcff8e9b9feb2aac54

diff --git a/.tx/merge-base b/.tx/merge-base
index 45b2986479..b274f04ae1 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Feb 14 13:06:18 CET 2014
+Fri Feb 14 13:26:38 CET 2014