-
Committer:
Bazaar Package Importer
-
Author(s):
Oliver Grawert
-
Date:
2010-11-24 14:12:57 UTC
-
mfrom:
(4.1.3 sid)
-
Revision ID:
james.westby@ubuntu.com-20101124141257-j8lfvzubian5cii0
Tags: 0.15.1b-5ubuntu1
* Merge from debian unstable. Remaining changes:
- libmad.thumb.diff: use "adr" instead of "add" to make code ready for
thumb2
- Provide-Thumb-2-alternative-code-for-MAD_F_MLN.diff: fix another
ftbfs with thumb2 as "rsc" doesnt exist anymore - thanks to Dave
Martin for this patch (LP: #534287).
* Update Provide-Thumb-2-alternative-code-for-MAD_F_MLN.diff according
to LP: bug #587632 and drop -marm