Merge lp://staging/~unity-api-team/indicator-network/lp1456307_15.04 into lp://staging/indicator-network/15.04
Proposed by
Antti Kaijanmäki
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Antti Kaijanmäki | ||||
Approved revision: | 487 | ||||
Merged at revision: | 484 | ||||
Proposed branch: | lp://staging/~unity-api-team/indicator-network/lp1456307_15.04 | ||||
Merge into: | lp://staging/indicator-network/15.04 | ||||
Diff against target: |
23534 lines (+9936/-10441) 66 files modified
CMakeLists.txt (+4/-0) data/CMakeLists.txt (+0/-15) doc/qt/cpp/examples/CMakeLists.txt (+1/-1) po/am.po (+154/-160) po/ar.po (+147/-165) po/ast.po (+190/-195) po/az.po (+189/-193) po/be.po (+149/-167) po/bg.po (+148/-166) po/br.po (+157/-163) po/bs.po (+149/-167) po/ca.po (+157/-163) po/ca@valencia.po (+157/-163) po/ckb.po (+147/-165) po/cs.po (+148/-166) po/da.po (+191/-197) po/de.po (+155/-161) po/el.po (+148/-166) po/en_AU.po (+160/-166) po/en_GB.po (+195/-200) po/eo.po (+148/-166) po/es.po (+157/-163) po/eu.po (+192/-198) po/fa.po (+153/-160) po/fi.po (+156/-163) po/fr.po (+189/-195) po/gd.po (+199/-207) po/gl.po (+154/-161) po/he.po (+196/-202) po/hu.po (+187/-194) po/id.po (+195/-199) po/indicator-network.pot (+82/-101) po/is.po (+193/-199) po/it.po (+197/-201) po/ja.po (+160/-166) po/ka.po (+147/-165) po/km.po (+192/-201) po/ko.po (+190/-194) po/ku.po (+188/-194) po/lb.po (+148/-166) po/lv.po (+183/-188) po/ms.po (+148/-166) po/nb.po (+189/-195) po/nl.po (+187/-194) po/oc.po (+151/-167) po/pa.po (+150/-168) po/pl.po (+189/-195) po/pt.po (+185/-190) po/pt_BR.po (+195/-202) po/ro.po (+156/-162) po/ru.po (+190/-197) po/sl.po (+194/-199) po/sr.po (+196/-201) po/sv.po (+190/-197) po/ta.po (+147/-165) po/th.po (+148/-166) po/tr.po (+165/-172) po/ug.po (+155/-162) po/uk.po (+199/-205) po/zh_CN.po (+193/-193) po/zh_TW.po (+189/-188) src/connectivity-api/connectivity-qml/CMakeLists.txt (+6/-5) src/connectivity-api/connectivity-qt/CMakeLists.txt (+28/-16) src/connectivity-api/connectivity-qt/connectivity-qt.pc.in (+10/-10) src/connectivity-api/connectivity-qt/ubuntu/connectivity/networking-status.h (+23/-3) tests/integration/CMakeLists.txt (+1/-1) |
||||
To merge this branch: | bzr merge lp://staging/~unity-api-team/indicator-network/lp1456307_15.04 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Charles Kerr (community) | Approve | ||
Review via email:
|
Commit message
- Fix .pc file and docs.
- no-op .po update because some strings changed place.
* No source string changes.
Description of the change
To post a comment you must log in.