diff options
| author | Edward Hervey <bilboed@bilboed.com> | 2011-09-23 18:27:11 +0200 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2011-09-23 18:27:11 +0200 |
| commit | 17bfba09f118efa4336be90233a142a7923016c9 (patch) | |
| tree | 688656232996408d024375e3a0f27225bc0836a2 /pkgconfig | |
| parent | 3f45eb1cfcb7937bbb621b23fa4f2b303c3fcd54 (diff) | |
| parent | 001b4a0072fae1f695698660e2d7642c37ea665b (diff) | |
Merge branch 'master' into 0.11
Conflicts:
ext/ogg/gstoggdemux.c
ext/pango/gsttextoverlay.c
gst-libs/gst/audio/gstaudioencoder.c
gst-libs/gst/audio/gstbaseaudiosrc.c
gst/playback/gstsubtitleoverlay.c
gst/videorate/gstvideorate.c
Diffstat (limited to 'pkgconfig')
0 files changed, 0 insertions, 0 deletions