Merge remote-tracking branch 'upstream/master' into master-to-security

This commit is contained in:
Erik Boasson 2020-03-19 08:18:48 +01:00
commit 67c49235db
110 changed files with 2714 additions and 4540 deletions

View file

@ -2150,7 +2150,7 @@ handshake;</li>
<li><i>dq.CHAN</i>: delivery thread for channel CHAN;</li>
&lt;li&gt;&lt;i&gt;tev.CHAN&lt;/i&gt;: timed-even thread for channel CHAN.&lt;/li&gt;&lt;/ul&gt;</xs:documentation>
&lt;li&gt;&lt;i&gt;tev.CHAN&lt;/i&gt;: timed-event thread for channel CHAN.&lt;/li&gt;&lt;/ul&gt;</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType>