commit | f87892638597e48e2c26c61ff3495d12fa97beac | [log] [tgz] |
---|---|---|
author | Sebastian Dröge <slomo@circular-chaos.org> | Tue Sep 24 16:34:15 2013 +0200 |
committer | Sebastian Dröge <slomo@circular-chaos.org> | Tue Sep 24 16:34:29 2013 +0200 |
tree | 2cd5089b173608efc2379033b08668be81e2b1ca | |
parent | 35f173479e3f4da3631b3af47c6ad08cac256fb4 [diff] | |
parent | 73cae22d46e765755355ae7068ab415ea751cea8 [diff] |
Merge branch 'upstream-experimental' into upstream Conflicts: docs/plugins/html/gst-plugins-good-plugins-gdkpixbufoverlay.html