Merged master into Lyberta/StandaloneOverkillWeapons.

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

diff --git a/.tx/merge-base b/.tx/merge-base
index ee5586a6fb73020e19402817433431d738fc67bd..a73edd9b09c1d382e82a78349f2295a1dbbbd4e6 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Apr 13 07:23:35 CEST 2017
+Sat Jun  3 07:23:47 CEST 2017