Merge branch 'master' into Mario/vaporizer_damage

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

diff --git a/.tx/merge-base b/.tx/merge-base
index a517ba03f14a4147d472872428ddb4e51b1b68fe..aaade5f752afc2314c43225e618bd799b63a3022 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jun  4 16:12:08 CEST 2014
+Tue Jan 13 19:44:31 CET 2015