Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 21 Jun 2011 15:54:38 +0000 (17:54 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 21 Jun 2011 15:54:38 +0000 (17:54 +0200)
Conflicts:
configure.ac
win32/common/config.h
win32/common/gstversion.h

1  2 
configure.ac
libs/gst/base/gstbasesink.c
win32/common/config.h

diff --cc configure.ac
Simple merge
Simple merge
Simple merge