← Back to team overview

cairo-dock-team team mailing list archive

Re: [Merge] lp:~cairo-dock-team/ubuntu/quantal/cairo-dock/3.0.2 into lp:ubuntu/cairo-dock

 

> Did you branch against the latest changes in the lp:ubuntu/cairo-dock package
Yes of course (as you can see here above, we only have the rev 27 as unmerged rev and the rev 26 has the same rev ID).

But I confirm this bug... This is strange because I only used bzr merge-upstream.
Note that on rev 26, there is a patch which was applied but the diff seems correct except that if you have a look to the conflict, it seems the previous patched was unapplied before merging...
-- 
https://code.launchpad.net/~cairo-dock-team/ubuntu/quantal/cairo-dock/3.0.2/+merge/111020
Your team Cairo-Dock Team is subscribed to branch lp:~cairo-dock-team/ubuntu/quantal/cairo-dock/3.0.2.


References