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 071bbeb694d1e06d323405b0584f40f124642622..db68ce74750b6e9d0ff3ab5b5d7502b8292c6d8f 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Jan  3 09:34:55 CET 2015
+Tue Oct 13 21:18:19 CEST 2015