Merge branch 'master' into 0.11
authorEdward Hervey <bilboed@bilboed.com>
Fri, 23 Sep 2011 11:09:25 +0000 (13:09 +0200)
committerEdward Hervey <bilboed@bilboed.com>
Fri, 23 Sep 2011 11:09:25 +0000 (13:09 +0200)
commit10e7159cf84ad8630eee80f04d8acfeffe92f065
tree379b9d218a7f5226b4ab7b0be38ea756c5847bf5
parent502a4636846b391ed09d41fe455040be656172d1
parent56b3acb043691809c5a4c4d1b65a76f3c05185bf
Merge branch 'master' into 0.11

Conflicts:
gst/gstcaps.c
gst/gstpad.c
libs/gst/base/gstbasesink.c
libs/gst/base/gstbasesink.h
libs/gst/base/gstbasetransform.c
gst/gstcaps.c
gst/gstpad.c
libs/gst/base/gstbasesink.h
libs/gst/base/gstbasetransform.c
tests/check/elements/filesrc.c