-
Committer:
Bazaar Package Importer
-
Author(s):
Timo Aaltonen
-
Date:
2007-03-02 10:18:43 UTC
-
mfrom:
(0.1.2 etch)
(1.1.2 upstream)
-
Revision ID:
james.westby@ubuntu.com-20070302101843-xcpjokdspm42f2bg
Tags: 1:1.3.0-1ubuntu1
* Merge from debian unstable. Remaining changes:
- debian/control:
+ Added Conflicts:, Replaces: xserver-xorg-driver-tdfx
+ Change Maintainer address.