-
Committer:
Bazaar Package Importer
-
Author(s):
Alessio Treglia
-
Date:
2008-12-29 17:36:47 UTC
-
mfrom:
(3.1.2 sid)
-
Revision ID:
james.westby@ubuntu.com-20081229173647-07w97wxjhbietvvw
Tags: 2.2.0-1.1ubuntu1
* Merge from debian unstable (LP: #312215), Ubuntu remaining changes:
- ffmpeg.c: use correct headers location to fix FTBFS with recent ffmpeg
snapshots (LP: #311007).