diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-24 12:56:16 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-24 12:56:17 +0200 |
| commit | f15105a02dc1c6b2b95b8ab0dafd36098840fb0e (patch) | |
| tree | 43496eee1f7b0621fe8cabcd295b68d0aade28d0 /src/plugins/blackberry/camera/bbvideodeviceselectorcontrol.h | |
| parent | 1b563aca1a98760c9dded9e8a3d4eb726abb0ae2 (diff) | |
| parent | d7dd22b9955ffde6d3c663655d9f9d4a58ca3894 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I15d0b9f03136840aff189ffb9de6e3899c204ca2
Diffstat (limited to 'src/plugins/blackberry/camera/bbvideodeviceselectorcontrol.h')
0 files changed, 0 insertions, 0 deletions