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

« back to all changes in this revision

Viewing changes to src/misc/cpu.c

  • Committer: Bazaar Package Importer
  • Author(s): Benjamin Drung
  • Date: 2010-04-23 12:16:15 UTC
  • mfrom: (1.1.29 upstream)
  • Revision ID: james.westby@ubuntu.com-20100423121615-512r13umjb9p4q1s
Tags: 1.0.6-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - build and install the libx264 plugin
  - add Xb-Npp header to vlc package
  - Add patches 519-526 to fix FTBFS with xulruner-1.9.2 from upstream
  - Add 600-drop-OJI-xul-192.patch to drop OJI support as xulrunner-1.9.2 on
    Linux doesn't support it
  - Add apport hook to include more vlc dependencies in bug reports
  - Drop --sourcedir=debian/tmp from dh_install to install apport hook
* Drop 527-spanish-desktop.patch (merged upstream).

Show diffs side-by-side

added added

removed removed

Lines of Context:
2
2
 * cpu.c: CPU detection code
3
3
 *****************************************************************************
4
4
 * Copyright (C) 1998-2004 the VideoLAN team
5
 
 * $Id: 964578335f69c431fd1e23323b76abe2a783e859 $
 
5
 * $Id: f5a019087222b9eaf1ab5145348588c7b066599c $
6
6
 *
7
7
 * Authors: Samuel Hocevar <sam@zoy.org>
8
8
 *          Christophe Massiot <massiot@via.ecp.fr>