Merge authors: Matthieu Baerts (matttbe) ------------------------------------------------------------ revno: 14 [merge] tags: 2.2.0~0rc1-0ubuntu1 fixes bug(s): https://launchpad.net/bugs/632055 https://launchpad.net/bugs/618336 https://launchpad.net/bugs/614686 https://launchpad.net/bugs/612617 https://launchpad.net/bugs/612355 https://launchpad.net/bugs/611733 author: Matthieu Baerts (matttbe) <[email protected]> committer: Bazaar Package Importer <[email protected]> branch nick: maverick timestamp: Tue 2010-09-07 22:31:25 +0200 message: * New Upstream Version (LP: #632055) * Fixed a few bugs on LP: - LP: #618336 all button tips visible if icons 'maximum zoom' set to 1.0 - LP: #614686 create new sud-dock icon that looking like flat - LP: #612617 Add custom launchers or sub-docks, can't modify name. - LP: #612355 Add option in config file to set GL/Cairo mode - LP: #611733 icon labels go off-screen * Fixed a crash when changing theme or gauges * Updated translations added: po/et.po po/fo.po modified: CMakeLists.txt copyright data/CMakeLists.txt data/cairo-dock-simple.conf.in data/cairo-dock.conf.in data/container.desktop data/gauges/battery/CMakeLists.txt data/gauges/battery/theme.xml data/gauges/turbo-night-fuel/CMakeLists.txt data/gauges/turbo-night-fuel/theme.xml data/launcher.desktop data/main-dock.conf.in data/separator.desktop debian/changelog debian/copyright po/ar.po po/be.po po/ca.po po/cairo-dock.pot po/cs.po po/de.po po/el.po po/en.po po/es.po po/eu.po po/fi.po po/fr.po po/hu.po po/it.po po/ja.po po/nb.po po/nl.po po/oc.po po/pt.po po/pt_BR.po po/ru.po po/sk.po po/sr.po po/sv.po po/tr.po po/uk.po po/vi.po po/zh_CN.po po/zh_TW.po src/cairo-dock-gui-main.c src/cairo-dock-gui-simple.c src/cairo-dock-menu.c src/cairo-dock-user-interaction.c src/cairo-dock-user-interaction.h src/gldit/cairo-dock-X-manager.c src/gldit/cairo-dock-X-utilities.c src/gldit/cairo-dock-applet-facility.c src/gldit/cairo-dock-applet-facility.h src/gldit/cairo-dock-applications-manager.c src/gldit/cairo-dock-backends-manager.c src/gldit/cairo-dock-backends-manager.h src/gldit/cairo-dock-callbacks.c src/gldit/cairo-dock-class-manager.c src/gldit/cairo-dock-container.c src/gldit/cairo-dock-container.h src/gldit/cairo-dock-data-renderer.c src/gldit/cairo-dock-data-renderer.h src/gldit/cairo-dock-dbus.c src/gldit/cairo-dock-desklet-factory.c src/gldit/cairo-dock-desklet-factory.h src/gldit/cairo-dock-desklet-manager.c src/gldit/cairo-dock-dialog-manager.c src/gldit/cairo-dock-dock-facility.c src/gldit/cairo-dock-dock-factory.c src/gldit/cairo-dock-dock-factory.h src/gldit/cairo-dock-dock-manager.c src/gldit/cairo-dock-dock-manager.h src/gldit/cairo-dock-draw-opengl.c src/gldit/cairo-dock-draw-opengl.h src/gldit/cairo-dock-draw.c src/gldit/cairo-dock-flying-container.c src/gldit/cairo-dock-gui-factory.c src/gldit/cairo-dock-gui-factory.h src/gldit/cairo-dock-internal-background.c src/gldit/cairo-dock-internal-background.h src/gldit/cairo-dock-internal-labels.c src/gldit/cairo-dock-internal-labels.h src/gldit/cairo-dock-internal-system.c src/gldit/cairo-dock-internal-system.h src/gldit/cairo-dock-launcher-manager.c src/gldit/cairo-dock-load.c src/gldit/cairo-dock-modules.c src/gldit/cairo-dock-notifications.h src/gldit/cairo-dock-opengl.c src/gldit/cairo-dock-opengl.h src/gldit/cairo-dock-packages.c src/gldit/cairo-dock-struct.h src/gldit/cairo-dock-themes-manager.c src/icon-factory/cairo-dock-desktop-file-factory.c src/icon-factory/cairo-dock-launcher-factory.c src/implementations/cairo-dock-gauge.c src/implementations/cairo-dock-gauge.h src/implementations/cairo-dock-graph.c src/implementations/cairo-dock-graph.h The size of the diff (135738 lines) is larger than your specified limit of 1000 lines
-- lp:ubuntu/maverick/cairo-dock https://code.launchpad.net/~ubuntu-branches/ubuntu/maverick/cairo-dock/maverick Your team Cairo-Dock Team is subscribed to branch lp:ubuntu/maverick/cairo-dock. To unsubscribe from this branch go to https://code.launchpad.net/~ubuntu-branches/ubuntu/maverick/cairo-dock/maverick/+edit-subscription _______________________________________________ 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

