Merge branch 'master' into Mario/vehicles

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

diff --git a/.tx/merge-base b/.tx/merge-base
index b274f04ae1736e9b4d0aad58d732e55abba70a88..cd53b6c9fab9227ddd1dfe27201e2535bf4f177a 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Feb 14 13:26:38 CET 2014
+Thu Aug 20 01:26:52 CEST 2015