Merge lp://qastaging/~lorenzo-carbonell/touchpad-indicator/test into lp://qastaging/touchpad-indicator
Proposed by
Horváth H. István
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~lorenzo-carbonell/touchpad-indicator/test |
| Merge into: | lp://qastaging/touchpad-indicator |
| Diff against target: |
14562 lines (+4661/-8796) (has conflicts) 43 files modified
bin/tp-indicator (+27/-0) data/Touchpad-Indicator.desktop (+11/-0) data/touchpad-indicator-autostart.desktop (+2/-2) debian/changelog (+5/-818) debian/control (+8/-16) debian/pyversions (+1/-0) debian/rules (+80/-5) debian/touchpad-indicator.install (+6/-0) img/icons/hicolor/scalable/actions/touchpad-indicator-dark-disabled.svg (+258/-0) img/icons/hicolor/scalable/actions/touchpad-indicator-light-disabled.svg (+254/-0) img/icons/hicolor/scalable/actions/touchpad-indicator-normal-disabled.svg (+242/-0) img/icons/hicolor/scalable/apps/touchpad-indicator-dark.svg (+199/-0) img/icons/hicolor/scalable/apps/touchpad-indicator-normal.svg (+209/-0) po/ca.po (+99/-366) po/cs.po (+78/-331) po/de.po (+113/-369) po/en.po (+95/-303) po/en_GB.po (+99/-366) po/es.po (+110/-366) po/eu.po (+89/-364) po/fi.po (+98/-361) po/fr.po (+114/-368) po/gl.po (+86/-360) po/id.po (+103/-331) po/it.po (+107/-366) po/ja.po (+78/-322) po/ka.po (+95/-303) po/lt.po (+96/-303) po/nl.po (+99/-316) po/pl.po (+98/-315) po/pt_BR.po (+83/-360) po/ru.po (+110/-375) po/sk.po (+79/-361) po/template.pot (+114/-0) po/tr.po (+95/-373) po/zh_CN.po (+105/-334) src/PreferencesManager.py (+334/-0) src/com.py (+61/-0) src/configurator.py (+45/-57) src/device_list.py (+61/-123) src/touchpad-indicator.py (+464/-0) src/touchpad.py (+48/-40) src/watchdog.py (+103/-122) Conflict adding file LICENSE. Moved existing file to LICENSE.moved. Conflict adding file bin. Moved existing file to bin.moved. Conflict adding file data. Moved existing file to data.moved. Conflict adding file debian. Moved existing file to debian.moved. Conflict adding file po. Moved existing file to po.moved. Conflict adding file src. Moved existing file to src.moved. |
| To merge this branch: | bzr merge lp://qastaging/~lorenzo-carbonell/touchpad-indicator/test |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Lorenzo Carbonell | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Unmerged revisions
- 1. By Lorenzo Carbonell <<email address hidden>
-
First test
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
