diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-03-29 15:12:21 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-03-29 15:12:21 +0200 |
| commit | e9ef6f6254f0c9a1e6e7008e93a8c03a47fa675b (patch) | |
| tree | 837eafef78e1a823c04c4e539d0626d18c4960f0 /docs | |
| parent | ed1642b997d976c47a33b292b865d1e9c8674d77 (diff) | |
| parent | 1f442d45b63be0ceacec801aee6eec7af540790a (diff) | |
Merge remote-tracking branch 'origin/0.10'
Conflicts:
gst/rtsp-server/rtsp-session-pool.c
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions