Merging Pidgin 2.x.y code into default branch

Mark Doliner mark at
Fri Jan 10 01:40:38 EST 2014

Hi Andrew and Pieter! I'd like to merge the code from our 2.x.y branch to main.

I know you guys had done some work on both branches. It looks like
most of the mxit changes in the 2.x.y branch are copied from main.
Should I just avoid merging mxit code from 2.x.y to main? Is that the
best thing to do?


More information about the Devel mailing list