Merge remote-tracking branch 'origin/0.10'
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 29 Mar 2012 12:54:53 +0000 (14:54 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 29 Mar 2012 12:54:53 +0000 (14:54 +0200)
commit4b6c3c7fea348f513e275d2394f9322f720e9831
tree26942397636bc0c52d43c8915e85998735a82c71
parentce67b0e539766275ba9d6bc6d4e41825e50eb791
parent9441e711df7a40135efd28ea7f9d1b50bfc59ef1
Merge remote-tracking branch 'origin/0.10'

Conflicts:
plugins/elements/gstmultiqueue.c
plugins/elements/gstinputselector.c
plugins/elements/gstmultiqueue.c
tools/gst-launch.c