Thu, 18 Feb 2010 22:42:19 +0000 |
Marcus Lundblad |
Make the check for PRPL-supplied TURN parameters in the new place
|
Thu, 18 Feb 2010 22:20:06 +0000 |
Marcus Lundblad |
Merge fix.
|
Thu, 18 Feb 2010 21:53:35 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head 267f28808ab6eeda6b5d68f6433f2b3fcf230d4f)
|
Sun, 14 Feb 2010 22:42:20 +0000 |
Marcus Lundblad |
merge of '4e5f78559deacc45eb458cdbe7ffc96491ab11bd'
|
Sun, 14 Feb 2010 22:26:14 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head 8cc16fcb41111aae817fe10168b40d82990895c5)
|
Sun, 14 Feb 2010 22:42:11 +0000 |
Marcus Lundblad |
Fix merge and a compilation error
|
Fri, 08 Jan 2010 23:33:51 +0000 |
Marcus Lundblad |
merge of '0e796ed7d94b3fa776ecd40ce0da65ae3f6b3242'
|
Fri, 08 Jan 2010 23:33:44 +0000 |
Marcus Lundblad |
Some merge-resolving...
|