Merge lp://staging/~nataliabidart/ubuntu-sso-client/die-hard into lp://staging/ubuntu-sso-client
Proposed by
Natalia Bidart
| Status: | Merged |
|---|---|
| Approved by: | Natalia Bidart |
| Approved revision: | 979 |
| Merged at revision: | 984 |
| Proposed branch: | lp://staging/~nataliabidart/ubuntu-sso-client/die-hard |
| Merge into: | lp://staging/ubuntu-sso-client |
| Diff against target: |
4967 lines (+36/-4621) 21 files modified
README (+6/-12) bin/ubuntu-sso-login-gtk (+0/-44) data/gtk/ui.glade (+0/-920) po/POTFILES.in (+0/-1) run-mac-tests (+1/-2) run-tests (+1/-13) run-tests.bat (+2/-2) setup.py (+0/-2) ubuntu_sso/__init__.py (+0/-1) ubuntu_sso/credentials.py (+4/-6) ubuntu_sso/gtk/__init__.py (+0/-29) ubuntu_sso/gtk/gui.py (+0/-1152) ubuntu_sso/gtk/main.py (+0/-41) ubuntu_sso/gtk/tests/__init__.py (+0/-29) ubuntu_sso/gtk/tests/test_gui.py (+0/-2291) ubuntu_sso/gtk/tests/test_main.py (+0/-51) ubuntu_sso/main/glib.py (+9/-9) ubuntu_sso/qt/__init__.py (+0/-1) ubuntu_sso/qt/tests/show_gui.py (+0/-2) ubuntu_sso/tests/__init__.py (+1/-1) ubuntu_sso/tests/test_credentials.py (+12/-12) |
| To merge this branch: | bzr merge lp://staging/~nataliabidart/ubuntu-sso-client/die-hard |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Roberto Alsina (community) | Approve | ||
| dobey (community) | Approve | ||
|
Review via email:
|
|||
Commit message
- Removing everything related to the GTK+ UI (LP: #1017690).
To post a comment you must log in.
Revision history for this message
| dobey (dobey) | # |
review:
Approve
Revision history for this message
| Roberto Alsina (ralsina) | # |
review:
Approve
Revision history for this message
| Ubuntu One Auto Pilot (otto-pilot) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Attempt to merge into lp:ubuntu-sso-client failed due to conflicts:
contents conflict in bin/ubuntu-
deleting parent in ubuntu_sso/gtk
unversioned parent in ubuntu_sso/gtk
deleting parent in ubuntu_
unversioned parent in ubuntu_
contents conflict in ubuntu_