Merge lp://qastaging/~docky-core/docky/drop-rsvg2 into lp://qastaging/docky

Proposed by Rico Tzschichholz
Status: Merged
Merged at revision: 1843
Proposed branch: lp://qastaging/~docky-core/docky/drop-rsvg2
Merge into: lp://qastaging/docky
Diff against target: 293 lines (+31/-33)
18 files modified
Docky.CairoHelper/Docky.CairoHelper.csproj (+0/-3)
Docky.CairoHelper/Makefile.am (+1/-2)
Docky.Items/Docky.Items.csproj (+0/-3)
Docky.Items/Makefile.am (+1/-2)
Docky.Services/Docky.Services.csproj (+0/-4)
Docky.Services/Docky.Services.dll.config (+2/-1)
Docky.Services/Docky.Services/Extensions/GdkPixbufExtension.cs (+5/-0)
Docky.Services/Docky.Services/NativeInterop.cs (+17/-0)
Docky.Services/Makefile.am (+2/-3)
Docky/Docky.csproj (+0/-4)
Docky/Makefile.am (+0/-1)
StandardPlugins/Clock/Clock.csproj (+0/-3)
StandardPlugins/Clock/Makefile.am (+0/-1)
StandardPlugins/Clock/src/ClockDockItem.cs (+1/-1)
StandardPlugins/Desktop/Makefile.am (+0/-1)
StandardPlugins/NetworkMonitor/Makefile.am (+0/-1)
StandardPlugins/WorkspaceSwitcher/Makefile.am (+0/-1)
configure.ac (+2/-2)
To merge this branch: bzr merge lp://qastaging/~docky-core/docky/drop-rsvg2
Reviewer Review Type Date Requested Status
Rico Tzschichholz Approve
Robert Dyer Pending
Review via email: mp+163602@code.qastaging.launchpad.net
To post a comment you must log in.
1844. By Rico Tzschichholz

services: update dllmap

Revision history for this message
Rico Tzschichholz (ricotz) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: