Merge branch 'master' into TimePath/unified_weapons

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

diff --git a/.tx/merge-base b/.tx/merge-base
index f702dee7cf323902e6e705e70421d07a106403ed..b0c891bbe5a7864b64d51f6a4f719d66c54d03ac 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Dec 30 12:43:17 CET 2014
+Mon Aug 31 21:02:59 CEST 2015