Merge lp://staging/~warp10/grouchery/grouchery-unity into lp://staging/grouchery
Proposed by
Andrea Colangelo
Status: | Merged |
---|---|
Merged at revision: | 29 |
Proposed branch: | lp://staging/~warp10/grouchery/grouchery-unity |
Merge into: | lp://staging/grouchery |
Diff against target: |
1188 lines (+282/-657) 16 files modified
GroucheryApplet.server (+0/-30) README (+0/-26) files/grouchery.conf (+8/-0) files/main_gui.glade (+0/-317) grouchery.conf (+0/-5) grouchery.py (+4/-19) grouchery/__init__.py (+22/-0) grouchery/app.py (+97/-0) grouchery/applet.py (+0/-70) grouchery/config.py (+47/-10) grouchery/gui.py (+0/-74) grouchery/include.py (+20/-9) grouchery/resources.py (+62/-30) grouchery/show.py (+0/-46) lists/groucho.list (+20/-20) setup.py (+2/-1) |
To merge this branch: | bzr merge lp://staging/~warp10/grouchery/grouchery-unity |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andrea Gasparini | Pending | ||
Review via email: mp+120364@code.staging.launchpad.net |
Description of the change
Huge amount of changes: drop bonobo stuff (replaced by appindicator), update to PyGI, new glade-free GUI, several bugixes and cleanup
To post a comment you must log in.