Merge lp://qastaging/~trb143/openlp/android_dev into lp://qastaging/openlp/android
Proposed by
Tim Bentley
| Status: | Merged |
|---|---|
| Merged at revision: | 45 |
| Proposed branch: | lp://qastaging/~trb143/openlp/android_dev |
| Merge into: | lp://qastaging/openlp/android |
| Diff against target: |
12 lines (+1/-0) 1 file modified
src/org/openlp/android/activity/preference/ConnectionPreferenceActivity.java (+1/-0) |
| To merge this branch: | bzr merge lp://qastaging/~trb143/openlp/android_dev |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Johan Mynhardt | Approve | ||
|
Review via email:
|
|||
Description of the change
a
To post a comment you must log in.
Revision history for this message
| Tim Bentley (trb143) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Right made a complete horlix of this request and managed to commit to trunk by accident.
Intelij and bzr are a marriage made in hell!
Lines 11 and 12 are the real change.
Line 10 is to force a difference to get this merge request out!