merge of 'a1e49bdf5d79109f7becf1a5b25ab023070524c9'
and 'b57b523dfd1778a15b58163ee82cd5e31d7cf57d'
| author |
Sean Egan <seanegan@gmail.com> |
| date |
Fri, 08 Jun 2007 20:55:13 +0000 |
| parents |
e60f5e8bb77e
(current diff)
cd2a9f9ca378
(diff) |
| children |
3bc25e19ce1c |
| files |
|
| diffstat |
2 files changed, 2 insertions(+), 1 deletions(-)
[+]
|
line diff
--- a/COPYRIGHT Fri Jun 08 19:31:31 2007 +0000
+++ b/COPYRIGHT Fri Jun 08 20:55:13 2007 +0000
@@ -226,6 +226,7 @@
Lalo Martins
John Matthews
Simo Mattila
+Michal Matyska
Ryan McCabe
Peter McCurdy
Kurt McKee
--- a/libpurple/protocols/simple/simple.c Fri Jun 08 19:31:31 2007 +0000
+++ b/libpurple/protocols/simple/simple.c Fri Jun 08 20:55:13 2007 +0000
@@ -1243,7 +1243,7 @@
foundxpidf = TRUE;
if(tmp2) {
*tmp2 = ',';
- tmp = tmp2;
+ tmp = tmp2 + 1;
while(*tmp == ' ') tmp++;
} else
tmp = 0;
