Merge lp://qastaging/~cszikszoy/docky/prefs-events into lp://qastaging/docky
Proposed by
Chris S.
| Status: | Merged |
|---|---|
| Merged at revision: | 1600 |
| Proposed branch: | lp://qastaging/~cszikszoy/docky/prefs-events |
| Merge into: | lp://qastaging/docky |
| Diff against target: |
727 lines (+184/-139) 23 files modified
Docky.Items/Docky.Items.csproj (+0/-3) Docky.Items/Docky.Items/AbstractDockItem.cs (+1/-0) Docky.Items/Docky.Menus/MenuItem.cs (+9/-6) Docky.Items/Makefile.am (+0/-1) Docky.Services/Docky.Services.csproj (+1/-0) Docky.Services/Docky.Services/DockServices.cs (+0/-1) Docky.Services/Docky.Services/IPreferences.cs (+2/-3) Docky.Services/Docky.Services/Preferences.cs (+58/-30) Docky.Services/Docky.Services/PreferencesChangedEventArgs.cs (+40/-0) Docky.Services/Docky.Services/PreferencesService.cs (+7/-3) Docky.Services/Docky.Services/SystemService.cs (+26/-22) Docky.Services/Makefile.am (+1/-0) Docky.Services/gtk-gui/generated.cs (+28/-34) Docky/Docky/Interface/DockPreferences.cs (+1/-1) StandardPlugins/Desktop/Desktop.csproj (+0/-3) StandardPlugins/Timer/Makefile.am (+0/-1) StandardPlugins/Timer/Timer.csproj (+0/-3) StandardPlugins/Timer/src/TimerDockItem.cs (+0/-4) StandardPlugins/Timer/src/TimerMainDockItem.cs (+0/-7) StandardPlugins/Trash/Makefile.am (+0/-1) StandardPlugins/Trash/Trash.csproj (+0/-3) StandardPlugins/Trash/src/TrashDockItem.cs (+10/-12) StandardPlugins/Trash/src/TrashItemProvider.cs (+0/-1) |
| To merge this branch: | bzr merge lp://qastaging/~cszikszoy/docky/prefs-events |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Docky Core | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
