@Fab: Thank you to have updated these two branches :) About the conflict: we have to add these lines for those who want to upgrade from Intrepid or Jaunty (who still use a very old release of CD) to a newer version :) -- https://code.launchpad.net/~cairo-dock-team/cairo-dock-core/ubuntu/+merge/32020 Your team Cairo-Dock Team is requested to review the proposed merge of lp:~cairo-dock-team/cairo-dock-core/ubuntu into lp:ubuntu/cairo-dock.
_______________________________________________ Mailing list: https://launchpad.net/~cairo-dock-team Post to : [email protected] Unsubscribe : https://launchpad.net/~cairo-dock-team More help : https://help.launchpad.net/ListHelp
