Merge remote-tracking branch 'origin/Mario/name_colors'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index fc9cb6ac1c5a04acf2701d0f8c28007055f3ec55..b274f04ae1736e9b4d0aad58d732e55abba70a88 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Jan 18 14:52:20 CET 2014
+Fri Feb 14 13:26:38 CET 2014