Client: Type check

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

diff --git a/.tx/merge-base b/.tx/merge-base
index ea94b9d5ddce9866b4fed3ad6f68a9d641ef1b05..b2b2ddca631fe972b7a6fe63d6ecdf789d678128 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Dec 31 22:24:30 CET 2014
+Fri Jan 15 22:48:00 CET 2016