Merge lp://staging/~renatofilho/indicators-client/fix-1186373 into lp://staging/indicators-client
Proposed by
Renato Araujo Oliveira Filho
Status: | Merged |
---|---|
Approved by: | Sergio Schvezov |
Approved revision: | 210 |
Merged at revision: | 210 |
Proposed branch: | lp://staging/~renatofilho/indicators-client/fix-1186373 |
Merge into: | lp://staging/indicators-client |
Diff against target: |
193 lines (+26/-22) 8 files modified
chewieui/Ubuntu/ChewieUI/ButtonMenu.qml (+3/-2) plugins/messagingplugin/qml/ActionButton.qml (+3/-3) plugins/messagingplugin/qml/ActionTextField.qml (+1/-1) plugins/messagingplugin/qml/GroupedMessage.qml (+7/-6) plugins/messagingplugin/qml/HeroMessage.qml (+5/-5) plugins/messagingplugin/qml/QuickReply.qml (+4/-2) plugins/messagingplugin/qml/SnapDecision.qml (+2/-2) plugins/messagingplugin/qml/TextMessage.qml (+1/-1) |
To merge this branch: | bzr merge lp://staging/~renatofilho/indicators-client/fix-1186373 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sergio Schvezov | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email: mp+166909@code.staging.launchpad.net |
Commit message
Avoid variable name conflicts, using the full path variable name.
To post a comment you must log in.
PASSED: Continuous integration, rev:210 jenkins. qa.ubuntu. com/job/ indicators- client- ci/19/ jenkins. qa.ubuntu. com/job/ indicators- client- saucy-amd64- ci/2 jenkins. qa.ubuntu. com/job/ indicators- client- saucy-armhf- ci/2
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ indicators- client- ci/19/rebuild
http://