← Back to branch summary

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

« back to all changes in this revision

Viewing changes to modules/gui/qt4/dialogs/playlist.cpp

  • 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/gui/qt4/dialogs/playlist.cpp
2
2
 * playlist.cpp : Playlist dialog
3
3
 ****************************************************************************
4
4
 * Copyright (C) 2006 the VideoLAN team
5
 
 * $Id: 2736e5279c3982fecec87e3c559362b66fe1ce96 $
 
5
 * $Id$
6
6
 *
7
7
 * Authors: Clément Stenac <zorglub@videolan.org>
8
8
 *