summaryrefslogtreecommitdiff
path: root/src/media-stream.c
diff options
context:
space:
mode:
authorWill Thompson <will.thompson@collabora.co.uk>2009-05-22 11:54:15 +0100
committerWill Thompson <will.thompson@collabora.co.uk>2009-05-22 11:54:17 +0100
commit5a17e139f6dcb3de92403b02994047f9010e59b9 (patch)
treeda68405d25a2bac193f8199d0c17196da66c383c /src/media-stream.c
parentfec464fe983952a47625f54faeb4c2a87d0cba7b (diff)
parent887837f3a31811d6f9dc0e792b0f9a6b01f0a701 (diff)
Merge branch 'stored-list'
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Diffstat (limited to 'src/media-stream.c')
0 files changed, 0 insertions, 0 deletions