Merge lp:~cr3/ubuntu-friendly/854636 into lp:ubuntu-friendly

Proposed by Marc Tardif
Status: Merged
Approved by: Nicola Heald
Approved revision: 94
Merge reported by: Nicola Heald
Merged at revision: not available
Proposed branch: lp:~cr3/ubuntu-friendly/854636
Merge into: lp:ubuntu-friendly
Diff against target: 14 lines (+0/-4)
1 file modified
apps/results/api.py (+0/-4)
To merge this branch: bzr merge lp:~cr3/ubuntu-friendly/854636
Reviewer Review Type Date Requested Status
Registry Administrators Pending
Review via email: mp+78949@code.launchpad.net
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
1=== modified file 'apps/results/api.py'
2--- apps/results/api.py 2011-10-10 17:46:10 +0000
3+++ apps/results/api.py 2011-10-11 12:12:24 +0000
4@@ -369,10 +369,6 @@
5 p_name = d.product_name
6 v_name = d.vendor_name
7 category = d.category_name.lower()
8- if d.bus_name is not None and \
9- d.bus_name == 'input' and \
10- category == 'video':
11- category = 'capture'
12 return {'identifier': self._generate_device_id(d),
13 'name': p_name,
14 'vendor_name': v_name,

Subscribers

People subscribed via source and target branches