diff options
| author | Eric Sandall | 2008-03-16 22:57:30 -0700 |
|---|---|---|
| committer | Eric Sandall | 2008-03-16 22:57:30 -0700 |
| commit | c0443505f70ec0ad96869dbcfd480f8d8d3fe7f1 (patch) | |
| tree | 5c8efe333511ad75148c7e1efcf50d151ff5741e /xorg-data/xbitmaps | |
| parent | 8dbcdd1e48592453b46630b04c293f572018e00b (diff) | |
xbitmaps: Auto-conflicts with all prior monolithic X providers
Diffstat (limited to 'xorg-data/xbitmaps')
| -rwxr-xr-x | xorg-data/xbitmaps/CONFLICTS | 6 | ||||
| -rw-r--r-- | xorg-data/xbitmaps/HISTORY | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/xorg-data/xbitmaps/CONFLICTS b/xorg-data/xbitmaps/CONFLICTS new file mode 100755 index 0000000000..5d1493e9a0 --- /dev/null +++ b/xorg-data/xbitmaps/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-data/xbitmaps/HISTORY b/xorg-data/xbitmaps/HISTORY index 28e9c0ea5c..1e7e60fbc0 100644 --- a/xorg-data/xbitmaps/HISTORY +++ b/xorg-data/xbitmaps/HISTORY @@ -1,3 +1,6 @@ +2008-03-16 Eric Sandall <sandalle@sourcemage.org> + * CONFLICTS: Auto-conflicts with all prior monolithic X providers + 2007-10-14 Ismael E. Luceno <ismael.luceno@gmail.com * DETAILS: Updated description & short @@ -25,3 +28,4 @@ 2005-11-25 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> * DETAILS, HISTORY: created spell + |