/www/pidgin: c0ed0bb4061b: Merging
Gary Kramlich <[email protected]> Mon, 13 Feb 2017 00:34:42 -0500
| Newsgroups | gmane.comp.gnome.gaim.cvs |
|---|---|
| Message-ID | <[email protected]> |
Q2hhbmdlc2V0OiBjMGVkMGJiNDA2MWI3N2M4NDcxYWIxZTE1MGI2YTgwZmQ1ZmY4NWE1CkF1dGhv cjoJIEdhcnkgS3JhbWxpY2ggPGdyaW1AcmVhcGVyd29ybGQuY29tPgpEYXRlOgkgMjAxNy0wMi0x MiAyMzozNCAtMDYwMApCcmFuY2g6CSBkZWZhdWx0ClVSTDogaHR0cHM6Ly9oZy5waWRnaW4uaW0v d3d3L3BpZGdpbi9yZXYvYzBlZDBiYjQwNjFiCgpEZXNjcmlwdGlvbjoKCk1lcmdpbmcKCmRpZmZz dGF0OgoKIGh0ZG9jcy9DaGFuZ2VMb2cgIHwgIDIxICsrKysrKysrKysrKysrKysrKysrKwogaHRk b2NzL2luZGV4LnBocCAgfCAgIDEgLQogaW5jL2Rvd25sb2Fkcy5pbmMgfCAgIDQgKystLQogaW5j L3ZlcnNpb24uaW5jICAgfCAgIDQgKystLQogNCBmaWxlcyBjaGFuZ2VkLCAyNSBpbnNlcnRpb25z KCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZnMgKDY4IGxpbmVzKToKCmRpZmYgLS1naXQgYS9odGRv Y3MvQ2hhbmdlTG9nIGIvaHRkb2NzL0NoYW5nZUxvZwotLS0gYS9odGRvY3MvQ2hhbmdlTG9nCisr KyBiL2h0ZG9jcy9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyNiBAQAogUGlkZ2luIGFuZCBGaW5jaDog VGhlIFBpbXBpbicgUGVuZ3VpbiBJTSBDbGllbnRzIFRoYXQncmUgR29vZCBmb3IgdGhlIFNvdWwK IAordmVyc2lvbiAyLjEwLjEyICgxMi8zMS8xNSk6CisJR2VuZXJhbDoKKwkqIHB1cnBsZS11cmwt aGFuZGxlciBub3cgd29ya3Mgd2l0aCBQeXRob24gMy54IChEYW5pw4PCq2wgdmFuIEVlZGVuKQor CSogRml4ZWQgYW4gaXNzdWUgd2hlcmUgdHJhbnNpZW50IHN0YXJ0dXAgc3RhdHVzZXMgY291bGQg YmUgZGVsZXRlZAorCSAgKEpha3ViIEFkYW0pICgjMTY3NjIpCisKKwlQaWRnaW46CisJKiBUaGUg c2hvdXQgc21pbGUgbm93IG1hdGNoZXMgdGhlIGRlZmF1bHQgdGhlbWUgKFN0ZXZlIFZhdWdodCkK KworCVdpbmRvd3MtU3BlY2lmaWMgQ2hhbmdlczoKKwkqIFVwZGF0ZXMgdG8gZGVwZW5kZW5jaWVz OgorCQkqIEN5cnVzIFNBU0wgMi4xLjI2CisJCSogbGlieG1sMiAyLjkuMgorCQkqIE5TUyAzLjE3 LjMgYW5kIE5TUFIgNC4xMC43CisJCSogUGVybCA1LjIwLjEKKwkJKiBTSUxDIDEuMS4xMgorCSog UmVtb3ZlIHN1cHBvcnQgZm9yIFRjbCBwbHVnaW5zCisKKwlHYWR1LUdhZHU6CisJKiBVcGRhdGVk IGludGVybmFsIGxpYmdhZHUgdG8gdmVyc2lvbiAxLjEyLjEuCisKIHZlcnNpb24gMi4xMC4xMSAo MTEvMjMvMTQpOgogCUdlbmVyYWw6CiAJKiBGaXggaGFuZGxpbmcgb2YgU2VsZi1TaWduZWQgU1NM L1RMUyBDZXJ0aWZpY2F0ZXMgd2hlbiB1c2luZyB0aGUgTlNTCmRpZmYgLS1naXQgYS9odGRvY3Mv aW5kZXgucGhwIGIvaHRkb2NzL2luZGV4LnBocAotLS0gYS9odGRvY3MvaW5kZXgucGhwCisrKyBi L2h0ZG9jcy9pbmRleC5waHAKQEAgLTExNCw3ICsxMTQsNiBAQAogCiA8cCBjbGFzcz0ibW9yZSIg aWQ9Imxvd2JsdXJiIj4KIDwhLS0gUHV0IGxpdHRsZSBuZXdzIGJsdXJicyBoZXJlISAtLT4KLVBp ZGdpbiAyLjEwLjExIGNvbnRhaW5zIGxvZ2luIGZpeGVzIGZvciBNU04gYW5kIHNvbWUgWE1QUCBz ZXJ2ZXJzLCBhbmQgUGlkZ2luIDIuMTAuMTAgY29udGFpbnMgPGEgaHJlZj0iL25ld3Mvc2VjdXJp dHkvIj5pbXBvcnRhbnQgc2VjdXJpdHkgdXBkYXRlczwvYT4uIFBsZWFzZSB1cGdyYWRlIQogPC9w PgogCiA8L2Rpdj4KZGlmZiAtLWdpdCBhL2luYy9kb3dubG9hZHMuaW5jIGIvaW5jL2Rvd25sb2Fk cy5pbmMKLS0tIGEvaW5jL2Rvd25sb2Fkcy5pbmMKKysrIGIvaW5jL2Rvd25sb2Fkcy5pbmMKQEAg LTQ0LDggKzQ0LDggQEAgaW5jbHVkZSgkX1NFUlZFUlsnRE9DVU1FTlRfUk9PVCddIC4gIi8uLgog CQknc3Vic2VjdCcgPT4gJ01hYyBPUyBYJywKIAkJJ2Rlc2NyaXB0aW9uJyA9PiAnRG93bmxvYWQg dGhlIGZyZWUgUGlkZ2luIHVuaXZlcnNhbCBjaGF0IGNsaWVudCBmb3IgTWFjIE9TIFgnLAogCQkn Ym9keScgPT4gJzxwPkZvciBhIG5hdGl2ZSBNYWMgT1MgWCBleHBlcmllbmNlIHdlIHJlY29tbWVu ZCA8YSBocmVmPSJodHRwOi8vYWRpdW0uaW0iIG9uQ2xpY2s9ImphdmFzY3JpcHQ6cGFnZVRyYWNr ZXIuX3RyYWNrUGFnZXZpZXcoIi9leHRlcm5hbC9hZGl1bS5pbSIpOyI+QWRpdW08L2E+LCB3aGlj aCB1c2VzIGxpYnB1cnBsZSAodGhlIGNvcmUgb2YgUGlkZ2luKSBmb3IgbXVjaCBvZiBpdHMgcHJv dG9jb2wgc3VwcG9ydC48L3A+Ci08cD5JZiB5b3VcJ3JlIHN1cmUgeW91IHdhbnQgdG8gdXNlIFBp ZGdpbiBvbiBPUyBYLCB5b3UgbWF5IGZpbmQgdGhlIHBhY2thZ2VzIHByb3ZpZGVkIHRocm91Z2gg PGEgaHJlZj0iaHR0cDovL2Zpbmtwcm9qZWN0Lm9yZy9kb3dubG9hZC8iIG9uQ2xpY2s9ImphdmFz Y3JpcHQ6cGFnZVRyYWNrZXIuX3RyYWNrUGFnZXZpZXcoIi9leHRlcm5hbC9maW5rcHJvamVjdC5v cmciKTsiPkZpbms8L2E+IG9yIDxhIGhyZWY9Imh0dHA6Ly93d3cubWFjcG9ydHMub3JnL2luc3Rh bGwucGhwIiBvbkNsaWNrPSJqYXZhc2NyaXB0OnBhZ2VUcmFja2VyLl90cmFja1BhZ2V2aWV3KCIv ZXh0ZXJuYWwvbWFjcG9ydHMub3JnIik7Ij5NYWNwb3J0czwvYT4gbW9yZSBjb252ZW5pZW50IHRo YW4gY29tcGlsaW5nIGZyb20gc291cmNlLiAgUGxlYXNlIG5vdGUsIDxpPndlIGRvIG5vdCBwcm92 aWRlIHN1cHBvcnQgZm9yIGlzc3VlcyByZWxhdGVkIHRvIGluc3RhbGxpbmcgRmluaywgTWFjcG9y dHMsIG9yIHRoZWlyIHBhY2thZ2VzIG9mIFBpZGdpbjwvaT4uIENvbnRhY3QgdGhvc2UgcHJvamVj dHMgZGlyZWN0bHkgd2l0aCBxdWVzdGlvbnMgb3IgY29uY2VybnMuPC9wPgotPHA+SWYgeW91XCdy ZSBzdXJlIHlvdSB3YW50IHRvIHVzZSBQaWRnaW4gb24gT1MgWCBhbmQgeW91IGRvblwndCB3YW50 IHRvIHVzZSBGaW5rIG9yIE1hY3BvcnRzLCB5b3UgY2FuIDxhIGhyZWY9Ii9kb3dubG9hZC9zb3Vy Y2UvIj5kb3dubG9hZCB0aGUgUGlkZ2luIHNvdXJjZTwvYT4gYW5kIGNvbXBpbGUuPC9wPicsCis8 cD5JZiB5b3VcJ3JlIHN1cmUgeW91IHdhbnQgdG8gdXNlIFBpZGdpbiBvbiBPUyBYLCB5b3UgbWF5 IGZpbmQgdGhlIHBhY2thZ2VzIHByb3ZpZGVkIHRocm91Z2ggPGEgaHJlZj0iaHR0cDovL2JyZXcu c2gvIiBvbkNsaWNrPSJqYXZhc2NyaXB0OnBhZ2VUcmFja2VyLl90cmFja1BhZ2V2aWV3KCIvZXh0 ZXJuYWwvYnJldy5zaCIpOyI+SG9tZWJyZXc8L2E+LCA8YSBocmVmPSJodHRwOi8vZmlua3Byb2pl Y3Qub3JnL2Rvd25sb2FkLyIgb25DbGljaz0iamF2YXNjcmlwdDpwYWdlVHJhY2tlci5fdHJhY2tQ YWdldmlldygiL2V4dGVybmFsL2Zpbmtwcm9qZWN0Lm9yZyIpOyI+RmluazwvYT4gb3IgPGEgaHJl Zj0iaHR0cHM6Ly93d3cubWFjcG9ydHMub3JnL2luc3RhbGwucGhwIiBvbkNsaWNrPSJqYXZhc2Ny aXB0OnBhZ2VUcmFja2VyLl90cmFja1BhZ2V2aWV3KCIvZXh0ZXJuYWwvbWFjcG9ydHMub3JnIik7 Ij5NYWNwb3J0czwvYT4gbW9yZSBjb252ZW5pZW50IHRoYW4gY29tcGlsaW5nIGZyb20gc291cmNl LiAgUGxlYXNlIG5vdGUsIDxpPndlIGRvIG5vdCBwcm92aWRlIHN1cHBvcnQgZm9yIGlzc3VlcyBy ZWxhdGVkIHRvIGluc3RhbGxpbmcgSG9tZWJyZXcsIEZpbmssIE1hY3BvcnRzLCBvciB0aGVpciBw YWNrYWdlcyBvZiBQaWRnaW48L2k+LiBDb250YWN0IHRob3NlIHByb2plY3RzIGRpcmVjdGx5IHdp dGggcXVlc3Rpb25zIG9yIGNvbmNlcm5zLjwvcD4KKzxwPklmIHlvdVwncmUgc3VyZSB5b3Ugd2Fu dCB0byB1c2UgUGlkZ2luIG9uIE9TIFggYW5kIHlvdSBkb25cJ3Qgd2FudCB0byB1c2UgSG9tZWJy ZXcsIEZpbmsgb3IgTWFjcG9ydHMsIHlvdSBjYW4gPGEgaHJlZj0iL2Rvd25sb2FkL3NvdXJjZS8i PmRvd25sb2FkIHRoZSBQaWRnaW4gc291cmNlPC9hPiBhbmQgY29tcGlsZS48L3A+JywKIAkpLAog CiAJJ3NvdXJjZScgPT4gYXJyYXkoCmRpZmYgLS1naXQgYS9pbmMvdmVyc2lvbi5pbmMgYi9pbmMv dmVyc2lvbi5pbmMKLS0tIGEvaW5jL3ZlcnNpb24uaW5jCisrKyBiL2luYy92ZXJzaW9uLmluYwpA QCAtMSw3ICsxLDcgQEAKIDw/cGhwCiAKIC8vIEN1cnJlbnQgUGlkZ2luIFJlbGVhc2UKLSRwaWRn aW5fdmVyc2lvbiAgICAgICAgPSAiMi4xMC4xMSI7CiskcGlkZ2luX3ZlcnNpb24gICAgICAgID0g IjIuMTAuMTIiOwogCiAvLyBDdXJyZW50IFdpbmRvd3MgUGlkZ2luIFJlbGVhc2UKLSRwaWRnaW5f d2luMzJfdmVyc2lvbiAgPSAiMi4xMC4xMSI7CiskcGlkZ2luX3dpbjMyX3ZlcnNpb24gID0gIjIu MTAuMTIiOwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K Q29tbWl0cyBtYWlsaW5nIGxpc3QKQ29tbWl0c0BwaWRnaW4uaW0KaHR0cHM6Ly9waWRnaW4uaW0v Y2dpLWJpbi9tYWlsbWFuL2xpc3RpbmZvL2NvbW1pdHM=