Viewing all changes in revision 8.
- Committer: Bazaar Package Importer
- Date: 2011-07-21 21:12:27 UTC
- mfrom: (1.1.9 experimental)
- Revision ID: james.westby@ubuntu.com-20110721211227-i7f0fi12n1t9vd8e
* Merge from debian/unstable
- don't build against libfaad, libdirac, librtmp and libopenjpeg
(all in universe)
- Extra conflicts on libswscale-extra-1 (can be dropped after natty release)
- don't build against libfaad, libdirac, librtmp and libopenjpeg
(all in universe)
- Extra conflicts on libswscale-extra-1 (can be dropped after natty release)
- files added:
- libavformat/metadata-example.c
- files removed:
- debian/patches/security
- files modified:
- .pc/01-Tweak-doxygen-config.patch/Doxyfile
expand all
collapse all
added
removed
