~ubuntu-branches/ubuntu/hardy/mplayerplug-in/hardy

Viewing all changes in revision 14.

  • Committer: Bazaar Package Importer
  • Author(s): Adrien Cunin
  • Date: 2007-01-16 23:09:42 UTC
  • mfrom: (1.1.7 upstream) (3.1.1 etch)
  • Revision ID: james.westby@ubuntu.com-20070116230942-9aczabmd95q0hoh1
Tags: 3.31+main-1ubuntu1
* Merge from Debian unstable. Ubuntu change:
   - debian/{control,mozilla-mplayer.links}: s/iceweasel/firefox/
* debian/control: s/iceape/mozilla/
* debian/mozilla-mplayer.links: removed mozilla->iceape symlinks

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: