Merge branch 'master' into Mario/wepent_experimental

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

diff --git a/.tx/merge-base b/.tx/merge-base
index cad503c676ba8cb5f25690658c44072d37cd01ef..d03c707af970540f1b97e8909029f4fb086f3843 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jun  4 16:01:46 CEST 2014
+Tue May 10 21:52:13 CEST 2016