X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=9893524f6ee2a6c7f9b3f26d2ab7069a3d49da7c;hb=6970c2ab91e2ac5057eddf2d50a73fe81f39fbc4;hp=9322cbe40aab30cd8f203a217ebc95611c84f251;hpb=129fa209a7798b37270a888523974533c1b4aa87;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 9322cbe40..9893524f6 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Aug  8 12:41:53 CEST 2015
+Thu Mar 30 07:24:50 CEST 2017