Wed, 02 May 2007 06:06:56 +0000 |
Ka-Hing Cheung |
merge of 790a91b1bb6c10ada984951cbd2485e95e5159fd and
|
Wed, 02 May 2007 05:25:27 +0000 |
Ka-Hing Cheung |
explicit merge of 'd42ad2da81f881b2fbd2fb080cc70a843bc70d02'
|
Sun, 15 Apr 2007 20:12:06 +0000 |
Richard Laager |
Make this compile.
|
Sun, 15 Apr 2007 05:42:29 +0000 |
Richard Laager |
propagate from branch 'im.pidgin.pidgin' (head 5e61fe349507736c585798abea83ef3d8383d8b4)
|
Sun, 15 Apr 2007 05:39:09 +0000 |
Richard Laager |
Really the last of the merge changes.
|
Sun, 15 Apr 2007 05:28:07 +0000 |
Richard Laager |
The last of the merge fix-ups.
|
Sun, 15 Apr 2007 05:01:55 +0000 |
Richard Laager |
propagate from branch 'im.pidgin.rlaager.merging.msnp13-and-pidgin' (head 8cfbe223ca6e514146a4d46aeab4c7816de17b79)
|
Sun, 15 Apr 2007 04:59:43 +0000 |
Richard Laager |
Fix up some gaim -> purple issues.
|