~ubuntu-branches/ubuntu/precise/ffmpeg-debian/precise

Viewing all changes in revision 17.

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-07-18 10:55:24 UTC
  • mfrom: (1.1.6 upstream) (0.1.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090718105524-joadmuw3zpqxlitc
Tags: 4:0.5+svn20090609-1ubuntu1
* merge from debian. Remaining changes:
  - don't build-depend on libfaad-dev, disabling faad decoder.
  - build arm vfp variant
* update gbp.conf
* move gbp.conf to debian/

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: