Merging next.minor into trunk

[Ethan Blanton]

Andrea Visinoni spake unto us the following wisdom:
> Mark Doliner ha scritto:
> > How do people feel about merging the im.pidgin.pidgin.next.minor
> > branch into im.pidgin.pidgin and making our next release 2.6.0?  I've
> > spent some time looking at next.minor today... the changes actually
> > aren't that bad.  The main changes are the addition of the theme
> > summer of code project from last year and some struct hiding.
> > 
> > If there are no objections I can merge that branch in the next few
> > days (and we can keep doing struct hiding until we think we want to
> > release).  Richard, did you say there was something you wanted to look
> > into before merging?
> > 
> > Regardless of what we do with next.minor, we may want to do a small
> > patch release of 2.5.5 with a fix for the ICQ connection problem, if
> > the problems persists.  See http://developer.pidgin.im/ticket/8198 for
> > more info.
> > 
> > -Mark
> 
> Maybe this ticket about themes is a little bit blocking...
> http://developer.pidgin.im/ticket/8085

This does not, and should not, block anything.  Drag-and-drop support
for any number of things would certainly be nice, but it can be added
later.

Ethan

-- 
The laws that forbid the carrying of arms are laws [that have no remedy
for evils].  They disarm only those who are neither inclined nor
determined to commit crimes.
		-- Cesare Beccaria, "On Crimes and Punishments", 1764
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://pidgin.im/pipermail/devel/attachments/20090129/91a057de/attachment.sig>