Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 25 Apr 2011 09:38:28 +0000 (11:38 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 25 Apr 2011 09:38:28 +0000 (11:38 +0200)
1  2 
configure.ac
gst/avi/gstavimux.c
gst/rtpmanager/rtpsession.c

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