| commit | 7555d0949f231f2263b45b0e791a1884fdc2c771 | [log] [tgz] |
|---|---|---|
| author | Wim Taymans <wim.taymans@collabora.co.uk> | Mon Apr 18 10:23:45 2011 +0200 |
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | Mon Apr 18 10:23:45 2011 +0200 |
| tree | f4a09aefcf97006a60303e8b93392de6b18788f7 | |
| parent | 8a4ae3dd2de4de1a11d982102e3881e313d4f37a [diff] | |
| parent | 75d5c41f2903b6703aa4d70b5f9fce6db1ad1e03 [diff] |
Merge branch 'master' into 0.11 Conflicts: android/apetag.mk android/avi.mk android/flv.mk android/icydemux.mk android/id3demux.mk android/qtdemux.mk android/rtp.mk android/rtpmanager.mk android/rtsp.mk android/soup.mk android/udp.mk android/wavenc.mk android/wavparse.mk configure.ac