← Back to branch summary

~ubuntu-branches/ubuntu/karmic/vlc/karmic-updates

« back to all changes in this revision

Viewing changes to src/input/clock.h

  • Committer: Bazaar Package Importer
  • Author(s): أحمد المحمودي (Ahmed El-Mahmoudy)
  • Date: 2009-08-01 05:54:24 UTC
  • mfrom: (3.4.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090801055424-adapguphw4qfvz6q
Tags: 1.0.1-1ubuntu1
https://launchpad.net/bugs/406602
https://launchpad.net/bugs/407570
* Merge from Debian unstable (LP: #406602, #407570), remaining changes:
  - build against xulrunner-dev instead of iceape-dev
  - build against libass-dev and libx264-dev
  - build against and install libx264 plugin
  - add Xb-Npp header to vlc package

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/input/clock.h
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2008 the VideoLAN team
5
5
 * Copyright (C) 2008 Laurent Aimar
6
 
 * $Id$
 
6
 * $Id: 13847931d072f7b98ed372ae0a1d4029e1be0a00 $
7
7
 *
8
8
 * Authors: Laurent Aimar < fenrir _AT_ videolan _DOT_ org >
9
9
 *