Merge branch 'terencehill/cvar_updates' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index bcae3725c0b24dce57f350cd7d14e6d243f4f0bd..aaade5f752afc2314c43225e618bd799b63a3022 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Jan  9 08:52:34 CET 2015
+Tue Jan 13 19:44:31 CET 2015