Proper tx sync.

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

diff --git a/.tx/merge-base b/.tx/merge-base
index a07b5a7db8463091046cd1b9585a544892d954cf..f5039c433d02c236ef6dfb6b97d1c6f1b96e8cd2 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jul  5 07:25:00 CEST 2017
+Thu Jul  6 03:30:00 CEST 2017