diff options
| author | Eric Sandall | 2008-03-16 22:58:39 -0700 |
|---|---|---|
| committer | Eric Sandall | 2008-03-16 22:58:39 -0700 |
| commit | 42e07ea0138e395d1fdf39488c40fcba057670f8 (patch) | |
| tree | 7b004ffabbdc4349033f92804d5dff62eb190bcc /xorg-font/encodings | |
| parent | 4d1bd710945bdc807c153614ef78f851fde849d4 (diff) | |
encodings: Auto-conflicts with all prior monolithic X providers
Diffstat (limited to 'xorg-font/encodings')
| -rwxr-xr-x | xorg-font/encodings/CONFLICTS | 6 | ||||
| -rw-r--r-- | xorg-font/encodings/HISTORY | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/xorg-font/encodings/CONFLICTS b/xorg-font/encodings/CONFLICTS new file mode 100755 index 0000000000..5d1493e9a0 --- /dev/null +++ b/xorg-font/encodings/CONFLICTS @@ -0,0 +1,6 @@ +conflicts xdirectfb y +conflicts xfree86-devel y +conflicts xfree86-libs y +conflicts xfree86-4.3 y +conflicts xfree86 y +conflicts xorg diff --git a/xorg-font/encodings/HISTORY b/xorg-font/encodings/HISTORY index d0669b2d99..5d949c9ed1 100644 --- a/xorg-font/encodings/HISTORY +++ b/xorg-font/encodings/HISTORY @@ -1,3 +1,6 @@ +2008-03-16 Eric Sandall <sandalle@sourcemage.org> + * CONFLICTS: Auto-conflicts with all prior monolithic X providers + 2007-08-04 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: update font description from SHORT (automated) remove BUILD_API and UPDATED @@ -28,3 +31,4 @@ 2005-11-25 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> * DETAILS, HISTORY: created spell + |