Merge lp://staging/~noskcaj/ubuntu/trusty/network-manager-vpnc/merge into lp://staging/ubuntu/trusty/network-manager-vpnc
Proposed by
Jackson Doak
| Status: | Merged |
|---|---|
| Merge reported by: | Dmitry Shachnev |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~noskcaj/ubuntu/trusty/network-manager-vpnc/merge |
| Merge into: | lp://staging/ubuntu/trusty/network-manager-vpnc |
| Diff against target: |
8206 lines (+2410/-2396) 28 files modified
.pc/01-fix-path-to-connection-editor-plugin-in-service-file.patch/Makefile.am (+0/-50) .pc/01-fix-path-to-connection-editor-plugin-in-service-file.patch/nm-vpnc-service.name.in (+0/-9) .pc/applied-patches (+0/-2) .pc/gtk_table_to_gtk_grid.patch/auth-dialog/vpn-password-dialog.c (+0/-443) Makefile.in (+176/-147) NEWS (+21/-0) aclocal.m4 (+389/-286) auth-dialog/Makefile.in (+173/-99) auth-dialog/vpn-password-dialog.c (+6/-6) compile (+7/-3) config.guess (+106/-78) config.sub (+60/-45) configure (+319/-237) configure.ac (+1/-1) debian/changelog (+19/-0) debian/control (+2/-0) debian/patches/01-fix-path-to-connection-editor-plugin-in-service-file.patch (+0/-37) debian/patches/series (+0/-1) depcomp (+269/-186) install-sh (+7/-7) missing (+159/-275) po/it.po (+75/-61) properties/Makefile.am (+1/-2) properties/Makefile.in (+193/-152) properties/nm-vpnc.c (+3/-0) properties/tests/Makefile.in (+189/-151) properties/tests/pcf/Makefile.in (+77/-36) src/Makefile.in (+158/-82) |
| To merge this branch: | bzr merge lp://staging/~noskcaj/ubuntu/trusty/network-manager-vpnc/merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
Merge from debian
To post a comment you must log in.
Revision history for this message
| Dmitry Shachnev (mitya57) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Already uploaded by Laney.