diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-04-04 12:10:45 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-04-04 12:10:45 +0200 |
| commit | bca1463a666bfc149a5fa2cf2acaa480f15b906a (patch) | |
| tree | 554b6898cf024ea2381444638d4b0eabb89f0895 /docs | |
| parent | ecf09f45f3495861e6583eb9a2101090b02e8d5a (diff) | |
| parent | 94c5f6dcc92fad688c5ed4e33fd93f2cd48e91f0 (diff) | |
Merge remote-tracking branch 'origin/0.10'
Conflicts:
gst/matroska/matroska-demux.c
gst/matroska/matroska-mux.c
gst/matroska/matroska-read-common.c
gst/matroska/matroska-read-common.h
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions