Fix barrel death message and assault objectives

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

diff --git a/.tx/merge-base b/.tx/merge-base
index a517ba03f14a4147d472872428ddb4e51b1b68fe..db68ce74750b6e9d0ff3ab5b5d7502b8292c6d8f 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jun  4 16:12:08 CEST 2014
+Tue Oct 13 21:18:19 CEST 2015