~ubuntu-branches/ubuntu/raring/xmame/raring

Viewing all changes in revision 11.

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2010-09-26 16:13:00 UTC
  • mfrom: (5.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20100926161300-w9eqjzwmi55ti0h4
Tags: 0.106-3.2ubuntu1
* Merge with Debian; remaining changes:
  - Add xmame-tools conflict with sdlmame-tools since both ship chdman
    (LP: #363676).
* Fix build failure on i386 (not just looking for an i486 cpu).

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: