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 2a874db8c884da4033b16d4ee10049da3a62296f..699ec31da5d12b5258b2fedf33858473aef493bd 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Dec 31 07:34:34 CET 2014
+Wed Oct 14 01:54:07 CEST 2015