X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=d03c707af970540f1b97e8909029f4fb086f3843;hp=9322cbe40aab30cd8f203a217ebc95611c84f251;hb=0c80664132da9b0ccd09fef46d220febe52e84d2;hpb=34095b88e7a8d82f83aca8ce1009f9622026d159

diff --git a/.tx/merge-base b/.tx/merge-base
index 9322cbe40a..d03c707af9 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Aug  8 12:41:53 CEST 2015
+Tue May 10 21:52:13 CEST 2016