entcs: initialize with MSG_ONE, not MSG_INIT

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

diff --git a/.tx/merge-base b/.tx/merge-base
index a51d6f860b002801ebdf40aa9d0f98861ffec88c..699ec31da5d12b5258b2fedf33858473aef493bd 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Aug 20 01:29:32 CEST 2015
+Wed Oct 14 01:54:07 CEST 2015