Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Sun, 10 Jul 2011 09:42:37 +0000 (11:42 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Sun, 10 Jul 2011 09:42:37 +0000 (11:42 +0200)
commitcaf1760694886186e312412f4b6811668607a079
tree7f66e5d2c6f17ca60dff4dac4a4f13608afa7649
parent1c4ec02be987edc92406e3741e33357a44960829
parentabb646dcd1920a5c2fcd49e3a76631beb3b71949
Merge branch 'master' into 0.11
gst/multifile/gstmultifilesrc.c