commit | b3dfca58d831361e0b914795a37e1105749ba062 | [log] [tgz] |
---|---|---|
author | Sebastian Dröge <slomo@circular-chaos.org> | Tue Sep 24 16:37:32 2013 +0200 |
committer | Sebastian Dröge <slomo@circular-chaos.org> | Tue Sep 24 16:38:59 2013 +0200 |
tree | 9692994d4a33fff593c0352227bb459f81367e26 | |
parent | bb4fe781b546abe0bd09c0661cd3140c5dfec808 [diff] | |
parent | 58cafcdab2ecd860a8cc5eb07a2050b7be9c693a [diff] |
Merge branch 'debian-experimental' Conflicts: docs/plugins/html/gst-plugins-good-plugins-gdkpixbufoverlay.html