another branches reshuffling

[Aaron J. Seigo]

On Thursday, July 7, 2011 16:46:38 Ivan Cukic wrote:
> I'll port all the changes to 4.7 branch, but I don't really want to deal
> with picking up the commits one by one - I'll just make one commit which
> 'ports'. Is it ok with everybody?

just keep in mind that the active-development/master branch needs to be able 
to be merged eventually back into master. active-development/4.7 is probably a 
throw-away effort (e.g. doesn't need to ever be merged into KDE/4.7) and so 
this is probably ok. but let's not create messes for our future selves when we 
eventually merge branches back into master :)

-- 
Aaron J. Seigo
humru othro a kohnu se
GPG Fingerprint: 8B8B 2209 0C6F 7C47 B1EA  EE75 D6B7 2EB1 A7F1 DB43

KDE core developer sponsored by Qt Development Frameworks
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part.
Url : http://mail.kde.org/pipermail/active/attachments/20110707/47074474/attachment.sig