Merge lp://staging/~dobey/ubuntuone-client-gnome/update-from-trunk into lp://staging/ubuntuone-client-gnome/stable-3-0
Proposed by
dobey
| Status: | Merged |
|---|---|
| Approved by: | dobey |
| Approved revision: | 18 |
| Merged at revision: | 18 |
| Proposed branch: | lp://staging/~dobey/ubuntuone-client-gnome/update-from-trunk |
| Merge into: | lp://staging/ubuntuone-client-gnome/stable-3-0 |
| Diff against target: |
838 lines (+7/-672) 11 files modified
gsd/Makefile.am (+2/-1) nautilus/Makefile.am (+3/-2) nautilus/context-menu.c (+1/-39) nautilus/location-widget.c (+0/-459) nautilus/location-widget.h (+0/-75) nautilus/nautilus-ubuntuone.gschema.xml.in.in (+0/-10) nautilus/ubuntuone-nautilus.c (+0/-50) nautilus/ubuntuone-nautilus.h (+0/-1) nautilus/utils.c (+0/-32) po/POTFILES.in (+0/-1) ubuntuone-client-gnome.convert (+1/-2) |
| To merge this branch: | bzr merge lp://staging/~dobey/ubuntuone-client-gnome/update-from-trunk |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tim Cole (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Remove the location bar widget in the Nautilus extension
Description of the change
Merge recent changes from trunk for the 2.99.5 release.
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
Looks sensible.