13 commits

Author	SHA1	Message	Date
vanitasvitae	3c4441af4f	Reorder imports	2017-06-18 12:08:47 +02:00
vanitasvitae	93a363377e	Merge remote-tracking branch 'upstream/master' into jingleS5B	2017-06-18 12:05:15 +02:00
Florian Schmaus	08a4ee4eb2	Reworked some Jingle unit tests to use Junit's "expected=" ... Also don't use randomString() because then the unit tests also depend on the correct behavior of it.	2017-06-17 16:08:32 +02:00
Florian Schmaus	2b11074950	Merge branch '4.2'	2017-06-17 15:55:38 +02:00
Florian Schmaus	05148ab0ad	Merge pull request #142 from vanitasvitae/jingleIBB ... Add Jingle InBandBytestream transports	2017-06-16 23:32:59 +02:00
Florian Schmaus	6712cc91c8	Merge pull request #139 from vanitasvitae/JingleErrors ... Remove unused errors and add missing ones	2017-06-16 23:19:50 +02:00
vanitasvitae	287976e0e0	Add Jingle InBandBytestream transports	2017-06-16 22:43:50 +02:00
vanitasvitae	8488831ddc	Add Jingle SOCKS5Bytestream transport	2017-06-16 22:14:42 +02:00
vanitasvitae	e33bb5a741	Reorder imports	2017-06-14 00:01:05 +02:00
vanitasvitae	a604266336	Create alternative-session JingleReason	2017-06-14 00:00:27 +02:00
vanitasvitae	62167a7857	Reorder imports	2017-06-13 23:58:41 +02:00
vanitasvitae	4ae8434852	Remove unused errors and add missing ones	2017-06-13 23:57:59 +02:00
vanitasvitae	0a31161950	Add tests for jingle classes ... Depends on #135, #136	2017-06-03 23:46:29 +02:00