(cherry picked from commit 286225e81e) # Conflicts: # modules/xmpp/SDP.jsdev1
|
|
||
42 |
|
42 |
|
43 |
|
43 |
|
44 |
|
44 |
|
45 |
|
|
|
46 |
|
45 |
|
47 |
|
46 |
|
48 |
|
47 |
|
|
|
||
258 |
|
257 |
|
259 |
|
258 |
|
260 |
|
259 |
|
261 |
|
|
|
262 |
|
|
|
|
260 |
|
|
263 |
|
261 |
|
264 |
|
262 |
|
265 |
|
263 |
|
|
|
||
486 |
|
484 |
|
487 |
|
485 |
|
488 |
|
486 |
|
489 |
|
|
|
490 |
|
|
|
|
487 |
|
|
491 |
|
488 |
|
492 |
|
489 |
|
493 |
|
490 |
|
|
|
||
1510 |
|
1507 |
|
1511 |
|
1508 |
|
1512 |
|
1509 |
|
1513 |
|
|
|
1514 |
|
|
|
1515 |
|
|
|
1516 |
|
|
|
1517 |
|
|
|
1518 |
|
|
|
1519 |
|
|
|
1520 |
|
1510 |
|
1521 |
|
1511 |
|
1522 |
|
1512 |
|
|
|
||
139 |
|
139 |
|
140 |
|
140 |
|
141 |
|
141 |
|
142 |
|
|
|
|
142 |
|
|
143 |
|
143 |
|
144 |
|
144 |
|
145 |
|
145 |
|
|
|
||
167 |
|
167 |
|
168 |
|
168 |
|
169 |
|
169 |
|
170 |
|
|
|
171 |
|
|
|
172 |
|
|
|
173 |
|
|
|
174 |
|
|
|
|
170 |
|
|
175 |
|
171 |
|
176 |
|
172 |
|
177 |
|
173 |
|