| commit | b78b980d7236d03378450ac89452dc4ec537824c | [log] [tgz] |
|---|---|---|
| author | Edward Hervey <edward.hervey@collabora.co.uk> | Fri Nov 25 12:48:58 2011 +0100 |
| committer | Edward Hervey <edward.hervey@collabora.co.uk> | Fri Nov 25 12:48:58 2011 +0100 |
| tree | 1a4bbff76ac8020b99f3321afa73eebbb4e9006d | |
| parent | c41b5d016cbbe8dc6fa99a377b169e96d24238a9 [diff] | |
| parent | cdcc39455cc92ba5e6988056b03ac9c350a9bb6a [diff] |
Merge remote-tracking branch 'origin/master' into 0.11 Conflicts: ext/faac/gstfaac.c ext/opus/gstopusdec.c ext/opus/gstopusenc.c gst/audiovisualizers/gstspacescope.c gst/colorspace/colorspace.c