diff options
| author | Eric Sandall | 2008-03-18 00:16:25 -0700 |
|---|---|---|
| committer | Eric Sandall | 2008-03-18 00:16:25 -0700 |
| commit | d36d70c514cf5185603eaaadce446bdb3c784ffb (patch) | |
| tree | c1f53813f2e2c063ef7026048fc8a5e4bfdd5c7b /xorg-font/font-misc-meltho | |
| parent | 64edaf03798ad3fbec00c003b9f95335ac7cf22f (diff) | |
font-misc-meltho: Auto-conflicts with xorg as well
Diffstat (limited to 'xorg-font/font-misc-meltho')
| -rwxr-xr-x | xorg-font/font-misc-meltho/CONFLICTS | 2 | ||||
| -rw-r--r-- | xorg-font/font-misc-meltho/HISTORY | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/xorg-font/font-misc-meltho/CONFLICTS b/xorg-font/font-misc-meltho/CONFLICTS index 5d1493e9a0..8007c92eb4 100755 --- a/xorg-font/font-misc-meltho/CONFLICTS +++ b/xorg-font/font-misc-meltho/CONFLICTS @@ -3,4 +3,4 @@ conflicts xfree86-devel y conflicts xfree86-libs y conflicts xfree86-4.3 y conflicts xfree86 y -conflicts xorg +conflicts xorg y diff --git a/xorg-font/font-misc-meltho/HISTORY b/xorg-font/font-misc-meltho/HISTORY index 8d20634cd4..12e87867b2 100644 --- a/xorg-font/font-misc-meltho/HISTORY +++ b/xorg-font/font-misc-meltho/HISTORY @@ -1,3 +1,6 @@ +2008-03-17 Eric Sandall <sandalle@sourcemage.org> + * CONFLICTS: Auto-conflicts with xorg as well + 2008-03-16 Eric Sandall <sandalle@sourcemage.org> * CONFLICTS: Auto-conflicts with all prior monolithic X providers |