Add shirt

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

diff --git a/.tx/merge-base b/.tx/merge-base
index d03c707af970540f1b97e8909029f4fb086f3843..c5fe85e273744d1266cb4d6223556b0e5d5094d9 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue May 10 21:52:13 CEST 2016
+Wed Jan 11 16:37:40 CET 2017