Add shirt

[xonotic/xonotic-data.pk3dir.git] / .tx / merge-base

diff --git a/.tx/merge-base b/.tx/merge-base
index 0d2f0c2939c18d4cd346221e800576213bce67b1..c5fe85e273744d1266cb4d6223556b0e5d5094d9 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Jan 11 07:37:55 CET 2015
+Wed Jan 11 16:37:40 CET 2017