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 fc9cb6ac1c5a04acf2701d0f8c28007055f3ec55..aaade5f752afc2314c43225e618bd799b63a3022 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Jan 18 14:52:20 CET 2014
+Tue Jan 13 19:44:31 CET 2015