-
Committer:
Package Import Robot
-
Author(s):
Micah Gersten
-
Date:
2012-03-04 03:19:06 UTC
-
mfrom:
(1.1.18)
(3.1.24 sid)
-
Revision ID:
package-import@ubuntu.com-20120304031906-p6q5rnb0xhgpof7o
Tags: 0.8.10-3ubuntu1
* Merge from Debian testing (FFe: LP: #940876), remaining changes:
- Use mozilla-flashplugin as the alternative for now
- Change xulrunner-dev build dep to firefox-dev
* Drop the plugin API porting patch, this has been fixed upstream
- drop debian/patches*
* Drop the following change as we want Adobe's player to take priority
if it's installed
- Set alternative priority to 50 so that it matches Adobe Flash's priority