Merged master into Lyberta/StandaloneOverkillWeapons.

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

diff --git a/.tx/merge-base b/.tx/merge-base
index db68ce74750b6e9d0ff3ab5b5d7502b8292c6d8f..a73edd9b09c1d382e82a78349f2295a1dbbbd4e6 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Oct 13 21:18:19 CEST 2015
+Sat Jun  3 07:23:47 CEST 2017