diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-26 21:16:57 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-26 21:16:57 -0300 |
| commit | 617a8054280a567b073ab9091ee7255ea803e8c7 (patch) | |
| tree | 5558fcef57cd5739e3741d981fab7764f728cdf8 /v4l2-spec/vidioc-enumaudio.sgml | |
| parent | b5ab4b1d0d5368b783725875a0bf6281074d2ef9 (diff) | |
| download | mediapointer-dvb-s2-617a8054280a567b073ab9091ee7255ea803e8c7.tar.gz mediapointer-dvb-s2-617a8054280a567b073ab9091ee7255ea803e8c7.tar.bz2 | |
v4l2-common: Fix a merge conflict bad solved
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'v4l2-spec/vidioc-enumaudio.sgml')
0 files changed, 0 insertions, 0 deletions