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 fa97f6f95163f1e6c766bf3fda1093ccb3d03b89..41092cd207969cced37b65c1e2d544ba5069c3e5 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Oct  4 13:03:13 CEST 2013
+Mon Dec 28 22:25:00 CET 2015