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 2a874db8c884da4033b16d4ee10049da3a62296f..cd53b6c9fab9227ddd1dfe27201e2535bf4f177a 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Dec 31 07:34:34 CET 2014
+Thu Aug 20 01:26:52 CEST 2015