Merge lp://staging/~timo-jyrinki/ubuntu/wily/wpa/reduce_debian_config_delta into lp://staging/ubuntu/wily/wpa
Proposed by
Timo Jyrinki
| Status: | Merged |
|---|---|
| Approved by: | Michael Terry |
| Approved revision: | 21 |
| Merge reported by: | Michael Terry |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~timo-jyrinki/ubuntu/wily/wpa/reduce_debian_config_delta |
| Merge into: | lp://staging/ubuntu/wily/wpa |
| Diff against target: |
31 lines (+8/-6) 2 files modified
debian/changelog (+8/-0) debian/config/wpasupplicant/linux (+0/-6) |
| To merge this branch: | bzr merge lp://staging/~timo-jyrinki/ubuntu/wily/wpa/reduce_debian_config_delta |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michael Terry | Approve | ||
|
Review via email:
|
|||
Commit message
* debian/
- Reduce the delta to Debian by removing the double setting of CONFIG_AP
and CONFIG_P2P. The only actual delta is CONFIG_ANDROID_HAL.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Lovely, thanks! :)
I have pushed to wily.