Leave the load in the weapon when throwing it

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 5c25368a0fb130a6bc02dc6a8b23b503520a3077..9745f61361ea974460edaf8e9c90a96700d78cb1 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Mar  3 07:23:44 CET 2018
+Sun Jun  3 07:24:16 CEST 2018