Merge branch 'packer/alias_movetospec' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index fc9cb6ac1c5a04acf2701d0f8c28007055f3ec55..41092cd207969cced37b65c1e2d544ba5069c3e5 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Jan 18 14:52:20 CET 2014
+Mon Dec 28 22:25:00 CET 2015