Merge lp:~anthonywong/ubuntu/utopic/gnome-bluetooth/lp1312349 into lp:ubuntu/utopic/gnome-bluetooth

Proposed by Mathieu Trudel-Lapierre on 2014-06-17
Status: Rejected
Rejected by: Mathieu Trudel-Lapierre on 2014-06-17
Proposed branch: lp:~anthonywong/ubuntu/utopic/gnome-bluetooth/lp1312349
Merge into: lp:ubuntu/utopic/gnome-bluetooth
Diff against target: 12 lines (+1/-1)
1 file modified
wizard/pin-code-database.xml (+1/-1)
To merge this branch: bzr merge lp:~anthonywong/ubuntu/utopic/gnome-bluetooth/lp1312349
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve on 2014-06-17
Review via email: mp+223476@code.launchpad.net

Description of the change

Fixes from Anthony Wong for bug 1312349.

To post a comment you must log in.
Mathieu Trudel-Lapierre (cyphermox) wrote :

This will actually need to be made into a proper patch rather than directly against the ubuntu: package branch. I'll do the changes myself; and credit you, Anthony. This has waited long enough (and I'm sorry about it).

I'll still mark the merge itself as rejected since it won't be uploaded as-is.

review: Approve

Unmerged revisions

94. By Anthony Wong on 2014-05-15

Fix the issue that mice cannot re-connect after disconnected.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'wizard/pin-code-database.xml'
2--- wizard/pin-code-database.xml 2014-04-25 02:00:56 +0000
3+++ wizard/pin-code-database.xml 2014-06-17 20:38:17 +0000
4@@ -88,7 +88,7 @@
5 <device name="iCade" type="keyboard" pin="ICADE"/>
6
7 <!-- Microsoft Wedge/Sculpt Touch mouse -->
8- <device oui="7C:1E:52:" type="mouse" name="Microsoft Touch Mouse" pin="0000"/>
9+ <device oui="7C:1E:52:" type="mouse" pin="0000"/>
10
11 <!-- GPS devices -->
12 <device oui="00:0D:B5:" name="TomTom Wireless GPS MkII" pin="0000"/>

Subscribers

People subscribed via source and target branches

to all changes: