Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Sat, 16 Apr 2011 14:06:02 +0000 (16:06 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Sat, 16 Apr 2011 14:06:02 +0000 (16:06 +0200)
commitcaaf5ad528d2fa280cbd1f3ad9022e881343cac6
tree24ebbe16dfa935776faf88a5d18785ca76db9a37
parenta70df76c5386aa57d12cd064a75d7fe6439474ac
parentd22ad73e7406024975cec4684ba1ebace350ba1f
Merge branch 'master' into 0.11
gst/Makefile.am
libs/gst/base/Makefile.am
libs/gst/check/Makefile.am
libs/gst/controller/Makefile.am
libs/gst/dataprotocol/Makefile.am
libs/gst/net/Makefile.am
win32/common/libgstbase.def