[KPhotoAlbum] stable branch merged

[Jesper K. Pedersen]

Jam, please svn rm the stable branch for now. With our current tools, I can't 
see how we can release from the stable branch.

Cheers

On Monday 15 February 2010 23:34:59 Jan Kundrát wrote:
| Andreas Neustifter wrote:
| > Are there any plans to merge these two branches? Otherwise its next to
| > impossible for me to do any useful work...
| 
| Agreed. Andreas, thanks for your feedback. Even though there wasn't much
| stuff exclusively in the stable branch anyway, I've merged it back to
| trunk in r1090735.
| 
| Dear contributors, please make sure that each and every of your fixes
| which hit the "stable branch"
| (branches/stable/extragear-kde4/graphics/kphotoalbum) hit trunk, too.
| I'd leave it up to Jesper to decide if the stable branch is still needed.
| 
| Cheers, and thanks for our patience. Yes, it makes zero sense to have
| fixes missing from trunk.
| 
| -jkt
| 

-- 
Jesper K. Pedersen | blackie at kdab.com
Senior Software Engineer and Global Training Manager
Klarälvdalens Datakonsult AB, a KDAB Group company
Tel. Sweden (HQ) +46-563-540090, USA +1-866-777-KDAB(5322)
KDAB - Qt Experts - Platform-independent software solutions