Mercurial > pidgin.yaz
comparison po/POTFILES.in @ 25920:9122bf747d3a
explicit merge of 'f29c90f0da72e27c601fd8c4e1aff2a250a52473'
and '8808ecc9353df49f85e0a292d690631c0ce895b5'
to branch 'im.pidgin.cpw.darkrain42.xmpp.bosh'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sat, 07 Mar 2009 01:36:57 +0000 |
| parents | bd2daa50744f |
| children | 4b8c4870b13a |
comparison
equal
deleted
inserted
replaced
| 25835:97a4d71e0c3d | 25920:9122bf747d3a |
|---|---|
| 131 libpurple/protocols/oscar/oft.c | 131 libpurple/protocols/oscar/oft.c |
| 132 libpurple/protocols/oscar/oscar.c | 132 libpurple/protocols/oscar/oscar.c |
| 133 libpurple/protocols/oscar/peer.c | 133 libpurple/protocols/oscar/peer.c |
| 134 libpurple/protocols/qq/buddy_info.c | 134 libpurple/protocols/qq/buddy_info.c |
| 135 libpurple/protocols/qq/buddy_list.c | 135 libpurple/protocols/qq/buddy_list.c |
| 136 libpurple/protocols/qq/buddy_memo.c | |
| 136 libpurple/protocols/qq/buddy_opt.c | 137 libpurple/protocols/qq/buddy_opt.c |
| 137 libpurple/protocols/qq/group.c | 138 libpurple/protocols/qq/group.c |
| 138 libpurple/protocols/qq/group_im.c | 139 libpurple/protocols/qq/group_im.c |
| 139 libpurple/protocols/qq/group_info.c | 140 libpurple/protocols/qq/group_info.c |
| 140 libpurple/protocols/qq/group_internal.c | 141 libpurple/protocols/qq/group_internal.c |