trunk -> 4.0 branch merge tomorrow

[Aaron J. Seigo]

hi all...

trunk and the 4.0 branch are both now open for development again. so tomorrow, 
somewhere around midnight UTC (so in the afternoon for me) i'll do the 
trunk->branch merge.

once done i'll post a reply to this message and trunk/ will be open for 4.1 
development at that point.

after the merge, please try and remember to backport all bug fixes that are 
appropriate to the 4.0.x branch. if you aren't familiar with how to do it, 
it's pretty easy:

0) before committing to trunk, create a diff file of the change
1) after committing to trunk, use svn switch to move to the 4.0 branch, e.g.:
svn switch 
svn+ssh://$USER@svn.kde.org/home/kde/brances/KDE/4.0/kdebase/workspace/etc..
2) apply the diff you create in step 0, then commit
3) svn switch back to trunk

this prevents you from having to have 2 copies checked out all the time and is 
decently quick to boot.

after the release event (i'll be a bit too busy mentally until then) i'd like 
to do a series of irc meetings to discuss 4.1 plasma development.

-- 
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 Trolltech
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://mail.kde.org/pipermail/panel-devel/attachments/20080106/43ae5e8d/attachment.pgp