Checkbox

Merge lp:~zyga/checkbox/fix-1235426 into lp:checkbox

  1. fix-1235426
  2. Merge into trunk
Proposed by Zygmunt Krynicki
Status: Merged
Approved by: Daniel Manrique
Approved revision: 3079
Merged at revision: 3080
Proposed branch: lp:~zyga/checkbox/fix-1235426
Merge into: lp:checkbox
Diff against target: 10 lines (+0/-1)
1 file modified
providers/plainbox-provider-checkbox/bin/camera_test (+0/-1)
To merge this branch: bzr merge lp:~zyga/checkbox/fix-1235426
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Review via email: mp+223407@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Manrique (roadmr) wrote :

Simple but to the point. Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'providers/plainbox-provider-checkbox/bin/camera_test'
--- providers/plainbox-provider-checkbox/bin/camera_test 2014-03-20 14:01:58 +0000
+++ providers/plainbox-provider-checkbox/bin/camera_test 2014-06-17 14:21:17 +0000
@@ -441,7 +441,6 @@
441 if e.errno != errno.EINVAL:441 if e.errno != errno.EINVAL:
442 print("Unable to determine supported framesizes "442 print("Unable to determine supported framesizes "
443 "(resolutions), this may be a driver issue.")443 "(resolutions), this may be a driver issue.")
444 return supported_formats
445 supported_format['resolutions'] = resolutions444 supported_format['resolutions'] = resolutions
446 return supported_formats445 return supported_formats
447446

Subscribers

People subscribed via source and target branches