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 946c98fc60de9289488e12b541a279166d439105..9745f61361ea974460edaf8e9c90a96700d78cb1 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Mar  2 07:24:40 CET 2018
+Sun Jun  3 07:24:16 CEST 2018