diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-12-12 12:40:17 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-12-12 12:40:17 +0000 |
| commit | 6bec783380681d870806666e49255d2196af9ed1 (patch) | |
| tree | 51fee1230010c83b2d9bac7a6cfcc1dd4fe91d0e /po | |
| parent | 59d5ad42b03254f5958b3164f82bbc27e457c6b2 (diff) | |
| parent | ee93a0c31c7f69ed9a5edda6addf533ae5a23c94 (diff) | |
| download | gstreamer-plugins-base-6bec783380681d870806666e49255d2196af9ed1.tar.gz | |
Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
gst-plugins-base.spec.in
po/LINGUAS
po/cs.po
po/eo.po
po/es.po
po/gl.po
po/lv.po
po/sr.po
Diffstat (limited to 'po')
| -rw-r--r-- | po/LINGUAS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/po/LINGUAS b/po/LINGUAS index c512a1a53..2f56e097f 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1 +1 @@ -af az bg ca cs da de el en_GB es eo eu fi fr gl hu id it ja lt lv nb nl or pl pt_BR ro ru sk sl sq sr sv tr uk vi zh_CN +af az bg ca cs da de el en_GB eo es eu fi fr gl hu id it ja lt lv nb nl or pl pt_BR ro ru sk sl sq sr sv tr uk vi zh_CN |