| 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.
|
| Sun, 15 Apr 2007 05:00:56 +0000 |
Richard Laager |
propagate from branch 'im.pidgin.rlaager.merging.msnp13-and-sf-1621854-4' (head 36b8a3e05397b5918f311a046fa580c5bb8846e0)
|
| Sun, 15 Apr 2007 04:29:56 +0000 |
Richard Laager |
merge of 'b4911943cba6f29cf0694dfd563cac17612236dc'
|
| Sun, 15 Apr 2007 03:56:08 +0000 |
Richard Laager |
propagate from branch 'im.pidgin.rlaager.merging.msnp13-and-sf-1621854-4-rlaager-whitespace' (head 51cec0ffea45c8589dcb7bf0f9e36e749ed43017)
|
| Sun, 15 Apr 2007 03:04:05 +0000 |
Richard Laager |
propagate from branch 'im.pidgin.rlaager.merging.msnp13-and-sf-1621854-1-rlaager-whitespace' (head 5083cfbc09503360bacf3ff0ebf528700770e6af)
|
| Sun, 15 Apr 2007 02:42:11 +0000 |
Richard Laager |
Revert some whitespace changes.
|
| Sun, 15 Apr 2007 04:46:02 +0000 |
Richard Laager |
Fix up msn-utils.c and msn-utils.h vs. msn-utils.c and msn-utils.h.
|
| Sun, 15 Apr 2007 03:43:17 +0000 |
Richard Laager |
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
|
