diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-03-22 11:53:24 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-03-22 11:53:24 +0100 |
| commit | c44cd8f55bc0bf409e86b039cad0e2f757d5c77e (patch) | |
| tree | fee1a36e4d8d8b533b6e5f0c811e4449f9d5f351 /po/af.po | |
| parent | 3e8ae7603ccbef3db071f8798a1d3809f40f8639 (diff) | |
| parent | 440d7034f09de014f96ec183cd59e2b43bcf75c7 (diff) | |
Merge branch 'master' into 0.11
unport gdkpixbuf
not merged: https://bugzilla.gnome.org/show_bug.cgi?id=654850
Conflicts:
docs/plugins/Makefile.am
docs/plugins/gst-plugins-good-plugins-docs.sgml
docs/plugins/gst-plugins-good-plugins-sections.txt
docs/plugins/gst-plugins-good-plugins.hierarchy
docs/plugins/inspect/plugin-avi.xml
docs/plugins/inspect/plugin-png.xml
ext/flac/gstflacdec.c
ext/flac/gstflacdec.h
ext/libpng/gstpngdec.c
ext/libpng/gstpngenc.c
ext/speex/gstspeexdec.c
gst/audioparsers/gstflacparse.c
gst/flv/gstflvmux.c
gst/rtp/gstrtpdvdepay.c
gst/rtp/gstrtph264depay.c
Diffstat (limited to 'po/af.po')
0 files changed, 0 insertions, 0 deletions