Avoid calculating the same averaging factor multiple times

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 881da7bafcaeafd12f6a8af171de6a57cdcac80c..41092cd207969cced37b65c1e2d544ba5069c3e5 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Dec 30 12:25:09 CET 2014
+Mon Dec 28 22:25:00 CET 2015