[Digikam-devel] kipi-plugins 2.0 branch merged

[Marcel Wiesweg]

Hi,

the "2.0" branch of kipi-plugins has been merged to master, 
heading for KDE 4.7.
In your local repositories, checkout master, pull, delete your local 2.0 
branch, and cleanup:
git checkout master
git pull
git branch -d 2.0
git remote prune origin
(assuming you have no local commits. If you have, rebase or cherry-pick)

Marcel