← Back to branch summary

~ubuntu-branches/ubuntu/lucid/vlc/lucid

« back to all changes in this revision

Viewing changes to modules/codec/cmml/history.c

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-11-12 15:29:11 UTC
  • mfrom: (3.5.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091112152911-skpz5ubpg18zjedp
Tags: 1.0.3-1ubuntu1
https://launchpad.net/bugs/435524
* Merge from Debian unstable (LP: #435524), remaining changes:
  - build against xulrunner-dev instead of iceape-dev
  - build against libx264-dev and install libx264 plugin
  - add Xb-Npp header to vlc package
  - recommend vlc-plugin-pulse for vlc
  - backport patch "402_increase_pulseaudio_score.diff"

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/codec/cmml/history.c
5
5
 *                    Organisation (CSIRO) Australia
6
6
 * Copyright (C) 2004 the VideoLAN team
7
7
 *
8
 
 * $Id: 702ae300d3ed4bab1d467d80e6cd8f4379db8b85 $
 
8
 * $Id$
9
9
 *
10
10
 * Authors: Andre Pang <Andre.Pang@csiro.au>
11
11
 *