Merge lp://staging/~sqp/cairo-dock-plug-ins/gauge-effect-new into lp://staging/~cairo-dock-team/cairo-dock-plug-ins/plug-ins
Proposed by
Matthieu Baerts
| Status: | Merged |
|---|---|
| Merged at revision: | 2071 |
| Proposed branch: | lp://staging/~sqp/cairo-dock-plug-ins/gauge-effect-new |
| Merge into: | lp://staging/~cairo-dock-team/cairo-dock-plug-ins/plug-ins |
| Diff against target: |
118 lines (+14/-3) 8 files modified
System-Monitor/data/System-Monitor.conf.in (+2/-0) System-Monitor/src/applet-config.c (+1/-0) System-Monitor/src/applet-init.c (+3/-2) System-Monitor/src/applet-struct.h (+1/-0) netspeed/data/netspeed.conf.in (+3/-0) netspeed/src/applet-config.c (+1/-0) netspeed/src/applet-init.c (+2/-1) netspeed/src/applet-struct.h (+1/-0) |
| To merge this branch: | bzr merge lp://staging/~sqp/cairo-dock-plug-ins/gauge-effect-new |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Cairo-Dock Devs | Pending | ||
|
Review via email:
|
|||
Description of the change
If it's ok to merge the other branch, I can merge this one too.
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
